hash map encode
unit test
escaped utf8 parser
fixed merge conflict