Merge pull request #716 from naturwerk/master

Back to Master
bug fixed (observation/new did not work anymore)
Merge pull request #717 from naturwerk/akaelin

Akaelin