Merge pull request #563 from naturwerk/master

back to master