update to add Android support