Improved date. Fixes #104