Minor changes

Please merge and publish a new version to nuget.