Merge pull request #1 from reimund/master

Merge