Merge pull request #564 from naturwerk/akaelin

Merge pull request #563 from naturwerk/master