Merge pull request #114 from mpeuster/master