Issue 133

Modified to 12 hour Format