Fix issue 4

Current calendar day-of-month was influencing month/year calculations.
Reset day-of-month to 1 always before doing those calculations.

Change-Id: I16c486fe756eeb3ad2f7bab33a6f2723fa96c043