Merge pull request #231 from mpeuster/master