Improves Android support (by David Turner).
4 files changed