Added better handling of dates. Also version bump v.1.0.18.