Merge pull request #1 from siudev/master

siudev와 동기화
Merge pull request #8 from MelonS/master

Merge pull request #2 from siudev/master