Merge pull request #710 from naturwerk/master

Back to master
Merge pull request #715 from naturwerk/akaelin

Merge pull request #710 from naturwerk/master