Merge pull request #1 from jemble/master

Pull Request to update
Merge pull request #5 from jonathanworth/master

Changes from last Thursday's practical.