Merge pull request #519 from naturwerk/master

Back to master
Testwise the code of leo deleted
Merge pull request #520 from naturwerk/emin

Emin