fixed typo
Merge branch 'james'
typos
Merge branch 'james'