Fix al viewport
Merge branch 'jorge'