Updated to support Android Studio / IntelliJ Idea