Bug fixes
Merge pull request #30 from NuGet/bhuvak-bugfixes

Bug fixes