Fix #28
Merge pull request #36 from makooot/For-issue#28

Fix #28