cleaning up
Merge pull request #61 from ipa-fxm/indigo_dev

cleaning up
Merge pull request #67 from ipa320/indigo_dev

updates from hydro_dev