Updated to work with Nuget