add function calculate score
Merge branch 'ju'