updated to work with Android Studio 0.5.9