Allow zone_id
to set zone
and vice versa
#162
Merged
zone_id
to set zone
and vice versa
#162