Merge pull request #206 from mpeuster/master