Merge branch 'pr/10' into merge-pr/10
fix some bugs
update README.md
Merge branch 'merge-pr/10'