Merge pull request #19 from ipa320/indigo_dev

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

Merge pull request #19 from ipa320/indigo_dev