better timezone support #237