Simplify excellent pull request to be even easier, and not require 'eval'
Merge pull request #32 from uberbrady/master

Additional cleanup to excellent pull request to make simpler