Updated docs.
Merge branch 'master' into gh-pages
Updated README.