Merge features from branch Iss1 nested fields

See #1 -- including requested functionality