Changed for ease of build and packaging

I will upload this version to Nuget.org.