mjwwit Merge pull request #68 from zc2638/feat/tz