Update master
Set UTF-8 as default encoding
Remove wrong return