แก้ไข encode
Merge branch 'master' of https://github.com/patcharra/risk