fixed order of drawing
Merge remote-tracking branch 'origin/master'