fix
logging
logging
content update
Merge branch 'master' of https://github.com/AuroraEN/alpha