Merge pull request #30 from abubeck/hydro_dev

upstream changes and python import improvement