Maintenance fix
Maintenance

Preparing for android release