Added 12hr support!
Updated for 1.4!
