Fix my fix of timezone... Sorry
Merge pull request #222 from Joushou/timezonefix

Fix my fix of timezone... Sorry