Merge pull request #82 from theponti/master

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

Merge pull request #82 from theponti/master