Improve Waveforms
v4.2.0
Merge pull request #20 from risgk/develop

v4.2.0