Merge pull request #231 from ping19/master

Positioning firing shots