Updated Analyzer and New Plotting Macro