added scala support too..