Merge pull request #130 from mpeuster/master