shumo branch
Merge pull request #2 from ChenShuMo/shumo

shumo branch