improved cross broswer compatability
Merge branch 'staging'