Merge pull request #192 from mpeuster/master