Merge pull request #3 from DerDu/master

Development
Merge pull request #4 from DerDu/development

Merge pull request #3 from DerDu/master