Added 24 hour time support