Fixing GIT errors
Merge branch 'galvarad/Other'
Fixing GIT errors