Add audio recording
Merge branch 'master' into dev