bug fixed
Merge branch 'master' of github.com:core2duoe6420/EOJ