Merge pull request #196 from mpeuster/master