Fix #182
Merge pull request #183 from mWater/master

Fix #182