Feature/endofmonth