added SimpleAnalysis for waveforms
bug fix