Merge pull request #9 from dinoboff/fix-evaluation

Fix evaluation