Safari bug fixes
Merge pull request #5 from oliverroick/safari

Safari bug fixes