Updated iOS and added Android support