Updated to work with current versio of Android Studio