Merge pull request #1 from VWStudio/master

back2
Revert "back2"
Merge pull request #3 from VWStudio/revert-1-master

Revert 1 master