Fix #30
Merge pull request #31 from makooot/For-issuee#30

Fix #30