Issue #376
Merge pull request #377 from waveney/wav7

Issue #376