Fix #27
Merge pull request #35 from makooot/For-issue#27

Fix #27