Added Android Studio 1.0 compatability