Small changes, mainly names and documentation
Merge branch 'master' of https://github.com/tomekjarosik/water