Now correct number of layers is drawn.
Merge remote-tracking branch 'origin/master'