Merge pull request #28 from mikeplavsky/master

Fix for wrong eval or query