Merge pull request #566 from naturwerk/akaelin

Merge pull request #565 from naturwerk/master
Merge pull request #567 from naturwerk/master

Merge pull request #566 from naturwerk/akaelin