Fixed tokenization
Merge pull request #17 from vamshiImaginea/master

Fixed tokenization