Minor tidying.
Merge branch 'master' of github.com:sos22/dissertation