Merge pull request #88 from mpeuster/master