Merge pull request #78 from mpeuster/master