Fixing typos
Merging master into gh-pages