Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Fix tokenization of !=
Merge pull request #6 from r-e-d/master

Fix tokenization of !=