sjm
Merge pull request #6 from shaojunmei/master

sjm