Updated Gradle configuration
Updated code validity, manually merged #472