Yao's correlation function code
Merge pull request #18 from beckermr/develop

Yao's correlation function code
Merging my working copy with Matt Becker's recent pull request of Yao's CF code.

Merge remote-tracking branch 'upstream/develop' into develop