Merge pull request #215 from theponti/master

Merge from master
Merge pull request #216 from theponti/development

Merge pull request #215 from theponti/master