Updating from shramov prior to adding initial support for KMZ