Merge pull request #124 from Alexpux/master

Merge develop branch to master