Merge pull request #7 from jemartti/master

Updating tz stuff to best practices