Merge pull request #556 from naturwerk/master

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

Merge pull request #556 from naturwerk/master