Merge pull request #118 from ipa-fxm/hydro_dev

Beautify and cleanup
Merge branch 'hydro_dev' into velocity_interface_controller