Merge branch 'Cross-Browser-Fixes' / Closes #2