Merge pull request #147 from mpeuster/master