fix #98 #99 and half of #100
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update README.md