Merge pull request #143 from theponti/master

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

Merge pull request #143 from theponti/master