Encoding aware
Improve encoding aware
Merge master to codescript