Fixes #20 and fixes #21. Also includes an upgrade to NuGet.exe