Fix some bug
Merge branch 'master' of https://github.com/dollars0427/Note