Now Works With Safari & Firefox