Updating master branch to version 2.0 code