Add encoding.js
Merge branch 'refs/heads/encoding' into dev