fiux
fix
Merge branch 'master' of https://github.com/linbc/soft_mgr into dev
fix