full conversion
Merge branch 'master' of https://github.com/Radiodef/WaveformDemo

adding full conversion