Use svg file rather than svgz
Fix sag problems
Merge branch 'master' into gh-pages