Updates for NAudio and Auto-discovery