Fix Issue #75 - Use DateTime class