Updating to latest Shock code.
Merge pull request #12 from jaredbischof/master

Updating to latest Shock code.