Merge pull request #67 from ipa320/indigo_dev

updates from hydro_dev