Improve tokenizer. Add slash.
Merge pull request #111 from bem/feature/tokenize

Improve tokenizer