Merge pull request #18 from zjjott/feature

Feature->Dev
Merge pull request #20 from zjjott/develop

Merge pull request #18 from zjjott/feature