many additions to fields and other improvements
Merge in v0.1.3 from upstream