Have "waves" properly singularize to "wave"
Merge branch 'waves-plural'