Added support for fields. Minor rewrite. This is why I love tests!
update nuget package