Fixed camera(hopefully)
Merge remote-tracking branch 'refs/remotes/origin/theAzack9'