Merge pull request #18 from zjjott/feature

Feature->Dev