Merge pull request #178 from mpeuster/master