[#307] polishing shooter form
Merge pull request #226 from gotar/307-polishing-shooter-form

[#307] polishing shooter form