Merge pull request #7 from schietto096/firstVSBranch

Merge pull request AndrewBranch and firstVSBranch