add eval
Merge branch 'master' of github.com:caoman/674project