More illustrative plotting
Merge branch 'masterCopy' into montecarlo