Merge pull request #34 from zjjott/feature

Feature
Merge pull request #35 from zjjott/develop

Merge pull request #34 from zjjott/feature