Added support for audio
Merge branch 'master' into testing