Small changes to A/V
Merge pull request #633 from Martijnvdc/master

Small changes to A/V