* fix bugs for Safari
Merge branch 'master' into gh-pages