Added initial Android support