Added 12h option and am/pm