Merge pull request #15 from garyservin/android

Merge changes from hydro-devel-fixed (Throttling)