Merge pull request #566 from teharrison/shock

Shock
Merge pull request #568 from teharrison/shock

merge from develop