Shooter changes
Merge branch 'master' of github.com:anidev/612-2013
jeff's fix