redo..
Merge pull request #570 from naturwerk/akaelin

redo..