typos
Merge branch 'typos'