updating hydro dev with latest changes from groovy_dev

fixes #23