Merge pull request #136 from Alexpux/master

Merge develop branch to master