Merge pull request #108 from theponti/master

Merge from master
Merge pull request #109 from theponti/develop

Merge pull request #108 from theponti/master