minor spelling/grammar corrections
Merge pull request #3048 from lucidlogic/master

minor grammar corrections
Check type of token as well.
Removed unnecessary 'else' statement
Merge pull request #3136 from melvinsh/patch-1

Removed unnecessary 'else' statement
fix conflicts.