Added new fields support
Merge pull request #7 from peter-volkov/greg_add_new_fields

Added new fields support