Modification to algorithm for formatting date/time combinations.
Fixes #76