Final commit for Tupi Mobile 1.0