Added support for Safari and Opera