merge fix
Gradle set up
Imporoving first working release