Added better version management, integrated in gradle build