Merge pull request #7 from jahary/win_branch

Win branch
뭔지 잘 모르겠어
Merge pull request #8 from socollin/soco

Merge pull request #7 from jahary/win_branch
ㅎㅎㅎㅎ