timezone corrected
Merge branch 'master' into timezone