update to add android support