Merge pull request #28 from fengjingchao/inst

Inst
test and refactor