fix master
Merge pull request #32 from konglingkai/masterfix

fix master