Merge pull request #180 from mpeuster/master