Merge pull request #186 from Alexpux/master

Update master to version 2.0.1