Zone behavior

Improved the zone behavior when adding zones. This fixes #18.