#8: some changes according to new spring boot framework