recommit
Merge pull request #2 from jizhang-cmu/hydro-indigo

Recommit