done fix safary
Merge remote-tracking branch 'origin/equalizer2' into equalizer2