함수구조변경
Merge remote-tracking branch 'origin/master'