Merge pull request #10 from aicl/develop

Merge pull request #9 from aicl/master
refactor...