Fix #21
Merge pull request #22 from makooot/For-issue#21

Fix #21