Branch/sound

@eric79 *This* is a real pull request.