Fix texts one more time for #95
Merge branch 'fix-dates' into development-phase1