Merge pull request #145 from mpeuster/master