Added scala configuration
Merget shit