Refactor API
Merge pull request #6 from utenmiki/refactor_api

Refactor API