a
d
Merge branch 'master' of https://github.com/kelvinyong/bace.git
solve some bugs