Merge pull request #24 from PilzAdam/water