Merge pull request #173 from mpeuster/master