Renamed draw, drawPoints, drawContour and drawBoth to old_draw...
Added a new method called draw that does everything