Merge pull request #147 from ndawe/master

[MRG] evaluate: handle TFormula and string input