Add timezone support from pull request #112