Seongmin second commit
Merge branch 'Seongmin'