SoundMaster class updated