Merge pull request #113 from mpeuster/master