more feature coverage, removed Gradle v1.8 deprecation warning
v0.3.60