Upgrade the BNFV spec
Start the calculator spec
Merge branch 'master' of https://github.com/jrootham/editor