Updated to work with Android Studio 1.0