Merge pull request #214 from mpeuster/master