Merge pull request #1 from kejukeji/master

first
sjm
Merge branch 'master' of https://github.com/shaojunmei/activity
sjm
Merge pull request #3 from shaojunmei/master

sjm