Merge pull request #530 from jmp75/visualstudio-build