Change to Json.NET for better deserialization
Update nuspec
Merge remote-tracking branch 'upstream/master'