Made branch compliant with latest version of AndroidNilewapp