stop using eval
Merge pull request #395 from WyseNynja/no_eval

stop using eval