Improved audio player
Merge branch 'develop'