Fixade getWidth() samt getHeight()
Merge branch 'peterH'