Merge pull request #89 from mpeuster/master