add encoding string
Merge branch 'master' into dev