Merge Branches

Merge master branch with version 2 branch.