modifiy
refactor to helper
Merge branch 'master' of https://github.com/ciffel/DaaS
fix bugs