Fixed an issue with safari
Merge branch 'master' of https://github.com/jheising/2019