Merge pull request from fishinablender/firstVSBranch to schietto096/firstVSBranch