typo fixes
Merge pull request #7 from bendyorke/fix-merge-bugs

typo fixes