Merge pull request #33 from igoryok-zp/popup_timezone_fix