First import, functional.
Corrects typos.
Merge branch 'hotfix/typos' into develop