[#37] Proper date format