fixed some bugs
Merge branch 'master' of https://github.com/s7070140/Note-that
fixed some bug