get rid of the use of eval
Merge pull request #34 from imlucas/replace-eval

get rid of the use of eval