Make feature/prefix detection work with SVG files
Replace 'div' with 'g' when in SVG land
Fix operator placement to match coding style
Merge pull request #496 from birtles/master

Fixes to work with SVG files