added tokenization option to parser