encoding at the front
Merge branch 'master' into testing