Merge pull request #153 from Alexpux/master

Merge develop branch to master