Merge branch 'master' of github.com:WeiMing2014/test
Merge branch 'master' of github.com:WeiMing2014/test