VS compat changes
Merge pull request #1 from ochilan/master

VS compat changes