Fix Snafu: Forgot to uncomment
Merge pull request #24 from garyservin/hydro-devel-fixed

Fix Snafu: Forgot to uncomment
Merge branch 'hydro-devel-fixed' into android
Merge pull request #25 from garyservin/android

Bring fix from hydro-devel-fixed