Updated to Android and iOS7