Closes #31 also for other time displays.