Merge pull request #230 from mpeuster/master