Be ast-ish!
Fix processing for character set
Merge branch 'change_tree_structure'