Update for new 6.2 branch and new master branch
Merge pull request #51 from liayn/master

Update for new 6.2 branch and new master branch