updated to support Gradle and Android studio