Fix #4
Merge pull request #10 from mWater/issue4

Fix #4