Fixed typos
Final commit
Merged