Updated for new version of Android Studio