Fixed spelling and grammar mistakes
Merge pull request #41 from Surram/spelling_and_grammar_fixes

Fixed spelling and grammar mistakes
Fix merge conflict with master, again