Merge branch 'issue-8' into 'develop-v2.1.1'

Made instances of s4watr:Water instances of s4watr:WaterKind

Closes #8

See merge request !9
2 jobs for develop-v2.1.1
in 2 minutes and 53 seconds, using 0 compute credits, and was queued for 4 seconds