first commital
Merge https://github.com/hayloo/Waterwet