Fixed bug 6, 7
Added state remodeling for subnets and zones
Merge fix
Fix for bug 8
Merge pull request #19 from ssirushchyshyn/develop

State remodeling for subnets and zones + bug 8