Merge pull request #31 from zhouhao/master

kexin