Merge pull request #197 from mpeuster/master