resolve
Merge branch 'master' of https://github.com/xwangsd/Scuba
resolve
Merge branch 'master' of https://github.com/xwangsd/Scuba
integrate with xinyu's new api