Feature/updates120614