Fix #45
Merge pull request #46 from makooot/For-issue#45

Fix #45