Merge branch 'hotfix/timezone' into develop
Merge pull request #9 from Linedwell/develop

Merge branch 'hotfix/timezone' into develop