Fix #25
Merge pull request #29 from makooot/For-issue#25

Fix #25