Updated for Safari Extension
Merge branch 'enhanceSafari' into develop
Optimized performance of QuickBlock