Add time zone support

Good point!  Done