Merge branch 'view-link'
stub added for perpendicularity
stub added for perpendicularity
Merge branch 'master' into view-link