Merge remote-tracking branch 'origin/bring_higher_res' into bring_higher_res
Tweaked camera parameters