Fix #23
Merge pull request #24 from makooot/For-issue#23

Fix #23