Improve VC support
Merge pull request #35 from Nairou/master

Improve VC support