Merge branch 'dev' into lec2