Fix #15
Merge pull request #16 from mWater/issue15

Fix #15