Add option to keep ASCII tokens
Merge branch 'master' of origin