Refactoring to remove eval
Merge pull request #98 from bruno-/master

Refactoring to remove eval