Merge branch 'master' into better-macros
Add a test for additional error case
Merge branch 'master' of github.com:cse-bristol/jasb