Fixed problem for single plot
Merge remote-tracking branch 'origin/master'