Merge pull request #167 from mpeuster/master