Fixes #82
Merge branch 'master' of https://github.com/ucam-cl-dtg/isaac-app