Merge pull request #174 from mpeuster/master