Fixed typos
Merge corrections from pborreli
Merge branch 'pborreli-typo'