Feature/lecture 06