Code: Simpler approach to evaluate variables.
Merge pull request #730 from am11/master

Code: Simpler approach to evaluate variables