bug fixed
Merge branch 'progressing' of https://github.com/hzzyyy/psaef into progressing