Merge pull request #33 from ipa320/indigo_dev

Indigo dev
Merge pull request #34 from ipa320/hydro_dev

updates from hydro_dev