Modified to verify that the range was in the viewport
Set a few things
Merge remote-tracking branch 'origin/master'
Set a few things