bug fixes
Merge branch 'master' of https://github.com/l0huan08/Library
bug fixes