bug fixing
Merge branch 'master' of github.com:Docear/Sync