Merge pull request #190 from mpeuster/master