Added AndroidStudio and Gradle compatibility