Merge pull request #140 from mpeuster/master