Merge pull request #65 from vasichkin/master

Change way zones handeled
FIX