Fixes Plot class
Final commit for CP1 V1