UPD: fix #1006: Timezone better fix
Merge pull request #1008 from angel-kulikov/master

UPD: small fixes