Added support for 12 Hour time