Fix #11
Merge pull request #12 from mWater/issue11

Fix #11