Improved docu
Merge branch 'master' into trunk

* master:
  Improved docu