Updated to use Android Studio