Merge pull request #80 from mpeuster/master