Merge pull request AndrewBranch and firstVSBranch