fixed timezone issue
Merge branch 'have'