master: evenbetter doc file
Merge branch 'master' into omega

* master:
  master: evenbetter doc file