better tokenizer

test pull request, it should update iw branch when ilariawonder will approve it.