Attempt to fix multiple errors
Merge branch 'master' of https://github.com/Pequeno0/NGJ14