Merge pull request #15 from cuberis/polish

Merge pull request #14 from cuberis/dev
Merge pull request #16 from cuberis/polish

Polish
quick fix for slide 21
Merge pull request #19 from cuberis/dev

Dev