Fixed #848

 + Added svg support (merged with TRIK branch)