Fixed #14. Added MatchFields annotation and MatchFieldsValidatior.