一些修改来自ubuntu
Merge branch 'master' of github.com:liangbizhi/job6