merger
Merge branch 'master' of https://github.com/shijingwang/python_tool.git
code fix