Merge pull request #2 from nsmathew/master

Merge settimezone-git