Merge pull request #19 from dssit/master

Performance improvements, SVG compatibility improvements