Merge pull request #146 from mpeuster/master