Merge pull request #67 from ipa320/indigo_dev

updates from hydro_dev
Merge pull request #68 from ipa320/hydro_dev

Merge pull request #67 from ipa320/indigo_dev