fix Issue #1 - proper timezone handling