Merge pull request #39 from bartj3/fix/timezones