more Scoring logic
Merge pull request #37 from agourlay/master

more Scoring logic