Feature/summer 2014