Merge pull request #56 from smolaon/master

[WIP] VW fixes