Separates correlation model from distance calculation
Merge pull request #209 from g-weatherill/corr_fix1

Separates correlation model from distance calculation