Updated to support Android Studio 1.0