fix bugs:
Merge branch 'master' of github.com:zhzhfriend/EP