Merge pull request #50 from Nesit/zones

Add zones
Merge pull request #51 from Nesit/zones

Fix saving
Merge pull request #52 from Nesit/zones

Fix zones
Fix zones