added firefox support
merged changes