audio added
Merge branch 'master' into newphilicia
debugged