Updated to latest Shock code.
Merge pull request #10 from jaredbischof/master

Updated to latest Shock code.