Merge pull request #1 from michalschroeder/develop

Merge with mschroeder Develop