Merge pull request #138 from mpeuster/master