Merge pull request #144 from ndawe/master

[MRG] New general evaluate() function