Merge pull request #64 from calvin0327/bump-common-to-v2

Merge pull request #64 from calvin0327/bump-common-to-v2 #39