Add some comments fix returns
fix stuff
Merge branch 'master' into gh-pages

* master:
  fix stuff
  Add some comments fix returns