Updated score calcualtion. Fixes #24