Merge pull request #120 from Alexpux/master

Merge develop branch to master