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

Recommit