Updated to work with Gradle 2.1