Merge pull request #437 from evoskuil/master

Update VS build configuration.