Added 12h clock support