Merged in changes to formula.js to stoic.io