fix some bugs
Merge branch '084'
update the contents of README.md