Merge pull request #133 from mpeuster/master