Fix #15
Merge pull request #20 from makooot/For-issue#15

Fix #15