Merge pull request #252 from hnyman/update-tz