Handle unicode content, close #316