Merge pull request #491 from naturwerk/master

back to master