Added an option to ignore short dates
Merge branch 'master' into lefilasoi