Return object reference in drawControls and drawBorders

Closes #556
Merge pull request #557 from Kienz/patch-3

Return object reference in drawControls and drawBorders. Closes #556.