Let user try again if repeated shot
Fix indentation
Merge branch 'master' into GUI