Fixing slide 19
Merge branch 'fix_slide19' into develop