Work on Android support
Preparing for merge
General Work