Updated for version 0.6.0 of Android Studio