Merge pull request #207 from mpeuster/master