Initial commit
delta changes
merging from krishna's master
merging from krishna's master
fixed the broken csproj file