eval bug fixed
Merge pull request #126 from kashjs/master

eval bug fixed