Merge pull request #28 from zjjott/feature

Feature
Merge pull request #29 from zjjott/develop

Merge pull request #28 from zjjott/feature