Fix on browsers other than Chrome
Merge remote-tracking branch 'upstream/dev' into ios

Conflicts:
	script.js
Fix options not being respected
Merge pull request #25 from Arcterus/ios

Fix on browsers other than Chrome