Seongmin Second commit
Merge branch 'Seongmin'