try to sort dates...not finished
Manage dates
Apply Sylvain's changes
Merge pull request #45 from kalbermattenm/fix_date_issue

Fix date issue