cc
Merge pull request #1 from SheanWang/master

cc merge