make pull request
commit 1 #18
commit 2 #18
commit 3 #18
Merge pull request #19 from nakair/1

[WIP]1