remove fake link
add header encoding
Merge branch 'master' into production