완성 1.1
Merge pull request #11 from kms2413/master

완성 1.1
Merge pull request #1 from ruinra/master

최종