Merge pull request #31 from zhouhao/master

kexin
Merge pull request #37 from zhouhao/kexin

Merge pull request #31 from zhouhao/master