Typos fixed.
merged jlsalvador-feature/fix_typos