Added support for non-chrome browsers