Merge pull request #1696 from esdrubal/tzrefactor