Merge pull request #218 from theponti/master

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

Merge pull request #218 from theponti/master