Extended Date module and fixed a bug with generating dates