make the code better
Merge pull request #43 from zxcvdavid/patch-1

make the code better
Merge pull request #44 from wenjun1055/master

fix some bug
Merge pull request #13 from walu/master

merge with walu