updated parser to handle no parameter formulae
finished with jeff wu
Merge remote-tracking branch 'origin/jeffwu'