Added find_tokens_until_match to make up for horrible parser
Merge branch 'master' of github.com:pxpeterxu/flexidata