기능 리팩토링
Merge branch 'issue#246' into dev