updated the drawing logic - it now works correctly
Merge remote-tracking branch 'origin/master'