cleanup for release to NuGet

cleanup for release to NuGet of issue #27, #26 and #25