Merge pull request #21 from ccc-larc/develop

Refine, add test cases and Travis CI support