Merge pull request #229 from theponti/master

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

Merge pull request #229 from theponti/master