Updated for Android Studip 1.0.1