Updated to work with release version of Android Studio