Merge pull request #5 from UCL/session3

Session 3: Code construction
Merge branch 'develop' into session4