Merge pull request #1 from ygpark/develop

Develop
Buffer overflow 에러 해결