fix encoding
doc fixes
Merge branch 'master' of https://github.com/engine-alpha/engine-alpha