Changed to work with model-view transform.
Merge remote-tracking branch 'origin/master'