Recommit
Merge pull request #1 from jizhang-cmu/hydro-indigo

Recommit