Merge pull request #135 from mpeuster/master