Merge pull request #242 from mpeuster/master