Fixed reading issue with whitespace before comment char, made tokenizer handle comment=None