Updated for AndroidStudio 1.0.1