Merge pull request #1 from kklt92/develop

Develop
Merge pull request #3 from kklt92/develop

finish most of function
 pass more test