Merge pull request #4 from kormat/master

Update to work with current eve-val