Fixes
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma
Merge pull request #167 from CarlRapp/master

Update