encode values
Merge branch 'dev'