#92, Made changes to support proper nuget references.