Merge pull request #556 from naturwerk/master

Back to master