Upgraded to work on Gradle v2