Crossbrowser support

merge into develo