refactoring
Merge branch 'master' of https://github.com/xwangsd/Scuba
intra testing