Bug/issue 215

Solved #215 based on #226 

일단 마지막 커밋만 봐주세요! (b4d576f)
(Test required)