Add timezone support
Merge pull request #202 from andig/fix-timezone

Add timezone support