converted to twigils
adding in test for syntax error
fixed
Merge branch 'master' into twigils
Merge branch 'master' into twigils