Merge pull request #1 from schuay/master