Adapted bits and pieces for the app to work also on Android-powered phones