Rebuilt for Android Studio