added separator logic
ignored failure test
removed crosstest
fixed token bug
Merge remote-tracking branch 'origin/master' into parser
Test fixed