Shotgun hopefully fixed
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma