Fix #16
Merge pull request #19 from makooot/For-issue#16

Fix #16