added timezone support and tests