changed sound handling (added multiple buffers for sounds)
Merge remote-tracking branch 'origin/master'