Merge branch 'Kevin'
added to viewport
removed dpi
Merge branch 'master' into Kevin