Refined scoring
Merge branch 'master' of https://github.com/mihai-chezan/xpress.git