Added handling of option-based fieldtypes
README and plugin update
Fixed a bug with parent matching
Fixed parent matching for real
README and plugin update
Merge branch 'master' into release/airbp