Added computations of all years
Merge branch 'issue-1'