Stuff
Improved readme
Merge branch 'master' into gh-pages

* master:
  Improved readme
  Stuff