Issue 501
Merge pull request #507 from waveney/wav18

Issue 501