Merge pull request #206 from arunthirupathi/zoneCheck