Adding more tips.
Merge branch 'master' into gh-pages

* master:
  Adding more tips.