Merge pull request #253 from ping19/master

Shot changes