Add back unicode support after fixing Issue #165.