Merge pull request #21 from WyseNynja/no_eval