Fixed plotting giving error if data is empty
Merge remote-tracking branch 'origin/master'