Merge pull request #12 from garyservin/android

Merge hydro-devel-fixed onto android