Fixed tokenizing at end of string
Merge branch 'release/0.0.3'