Merge pull request #24 from theponti/development

Development
Merge pull request #25 from theponti/master

Merge pull request #24 from theponti/development