fix for varying resolutions
Merge branch 'develop'