removed android support and updated keywords