Zone support and generate vault key only if needed
Merge pull request #35 from dmakhno/zone-support

Zone support and generate vault key only if needed