Merge pull request #37 from mpeuster/master