final version
Merge branch 'master' of github.com:huangdl007/ELibrary