update to for new shock return structure
Merge pull request #148 from teharrison/master

update to for new shock return structure