Merge pull request #701 from naturwerk/master

back to master