Fixed tokenizer; Expand CR rules
auto-merge staging into master