updated to support Gradle and Android studio
Merge remote-tracking branch 'origin/master'