bug fixed
Merge branch 'graduation' into demo