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

Updated to latest Shock code.