safari fixes
Merge pull request #30 from billautomata/master

safari fixes