Made changes to enable waveform reading.
Merge pull request #7 from cgranade/dev

Made changes to enable waveform reading.