refactoring + add test intra
Merge branch 'master' of github.com:fredfeng/ScubaTest