Fix for the none values in evaluate function
Merge pull request #51 from jp111/new