Fix for #26
Fix for a problem with today index