Merge pull request #115 from mpeuster/master