Merge pull request #256 from walshjon/res_scat

Improved resonance scattering methods