updated with examples and refs
small comment
corrected log message
corrected some mess
Merge branch 'master' into production

* master:
  corrected some mess
  corrected log message
  small comment
  updated with examples and refs
bcc corrected