优化逻辑，增加载入Log
Merge remote-tracking branch 'origin/master' into gh-pages