Fix #33
Merge pull request #38 from makooot/For-issue#33

Fix #33