Merge pull request #282 from theponti/master

Merge with master
Merge pull request #283 from theponti/development

Merge pull request #282 from theponti/master