Fixing a pixel problem
Merge branch 'develop'