Removed unnecessary encoding
Merge branch 'master' into tv