Fix encoding issues
Merge branch 'master' of https://github.com/uclataubetapi/tbpsite