Feature/update for 2015