Fix for timezone.
Merge pull request #169 from LazyChild/timezone_fix

Fix for timezone.
Merge pull request #172 from cloudspokes/timezone-fix

Timezone fix