fixed typos
Merge branch 'master' into lr0