Merge pull request #1 from mpeuster/master