Fix #26
Merge pull request #34 from makooot/For-issue#26

Fix #26