Merge pull request #109 from theponti/develop

Merge pull request #108 from theponti/master