inserted break statements into their proper place
Merge remote-tracking branch 'origin/sounds' into sounds