Feature/spring3 2