Feature/svg

@piranna I'm using this to fix and tweak your PR before merging in into the master

Closes #3