Upgraded to be compatible with Gradle 2.0