fixed summer time issue
Merge branch 'Test'