Fixed typo in comment
Fixed typos in code
Merge pull request #92 from mdxs/fix_typo_in_merge

Fixed typo in merge code/comments