sjm
Merge pull request #5 from shaojunmei/master

sjm