Merge pull request #182 from Alexpux/master

Update master branch to version 2.0.0