encoded strings + minor design changes
Merge branch 'origin/master'