Merge pull request #565 from naturwerk/master

Merge pull request #564 from naturwerk/akaelin