More public headers
added -waitUntilFinished to tokenizer