added start of Android support