Added audio support
Merge branch 'audio'