Merge pull request #116 from mpeuster/master