Fixed a couple typos
Merge branch 'master' into speed