New version based on gradle build system
merge