Added multiple changes to repo for fix
csproj
Merge remote-tracking branch 'origin/master'