Updated to run on Android Studio 1.0.0