Merge branch 'master' into gh-pages
fix style
fix style
Fix for Safari and IE10
Merge branch 'gh-pages'