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

Updated to latest Shock code.