clean code
Add more waveforms
Merge branch 'development' of github.com:jackwillis/boueux into development