adding nclud to cv
merging upstream changes