Works in others besides chrome now
Merge branch 'master' into develop