fix
代码fix与功能增强
solv conflict
Merge branch 'master' of https://github.com/shijingwang/python_tool.git