Ensure times are in local zone
Merge branch 'hotfix/v0.4.1'