Update Lesson-6 and 7
merge from develop