Merge pull request #27 from garyservin/android

Bring fixes on the hydro-devel branch