bugfix
merge
Merge pull request #6 from pengzhanlee/master

test