Merge pull request #240 from mpeuster/master