Latest changes from Munchoid. Android support.