Merge pull request #179 from Alexpux/master

Update master branch