commit to merge
Merge branch 'master' of https://github.com/daizhihui/tinyBase
correct errors
Merge branch 'master' of https://github.com/daizhihui/tinyBase