Merged TestBranch with Master - New and optimized way of drawing.