sjm
Merge pull request #4 from shaojunmei/master

sjm