Merge pull request #128 from mpeuster/master