Fixed merge conflicts
Merge branch 'master' into gh-pages

 done.
Fixed typos