major bug fixed. tokenization now works
Merge pull request #24 from korpling/develop

major bug fixed. tokenization now works