Merge pull request #1 from DerDu/development

Development
Merge pull request #2 from DerDu/development

Development
Merge pull request #3 from DerDu/master

Development