Changed timezone code
Merge branch 'modules' of https://github.com/scrollback/scrollback into modules