Updated Shotgun
Merge pull request #2 from jzhangx2/master

Updated Shotgun