Fixed Tokenizer

Added trim() to fix critical bug which caused to tokenizer to fail
Using recursion to tokinize,