Merge pull request #230 from theponti/development

Merge pull request #229 from theponti/master
Merge pull request #232 from theponti/development

Development
Merge pull request #233 from theponti/master

Merge from master