Issue 237

https://github.com/balderdashy/waterline/issues/237
Merge pull request #298 from timestep/patch-2

Issue 237