Made into PCL
Updated for nuget