Updated the master branch to 2.0.2