Merge pull request #589 from naturwerk/master

back to master
bug fix
Merge pull request #590 from naturwerk/akaelin

Akaelin