Doc improvement and bug fix
Merge branch 'master' into dev

* master:
  Merging with dev