update date handling
Merge branch 'origin/feature-gui'