Refactor 1
Merge branch 'master' of https://github.com/JKapitein/hydro-hackathon