Merge pull request #1 from michalschroeder/develop

Merge with mschroeder Develop
Merge pull request #8 from young-digital-planet/develop

Merge pull request #1 from michalschroeder/develop