Changed dst_tot to calculate average regardless of nan values and added a new count Closes #78 See merge request !194