fixed typos
Merge branch 'james'