Refined camera.
Merge origin/master