merged Audio into Editing issue #204