fixed typos
Merge branch 'master' into refactor/with-ste