Merge pull request #14 from jaredbischof/master

Update to Shock version.
Updated to latest Shock code.