diff --git a/pom.xml b/pom.xml
index 77b4f21..f692bce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>org.fross</groupId>
 	<artifactId>quoter</artifactId>
-	<version>5.0.17</version>
+	<version>5.0.18</version>
 	<packaging>jar</packaging>
 
 	<name>quoter</name>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9c82aae..a3d8c5d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: quoter
-version: '5.0.17'
+version: '5.0.18'
 summary: Command line utility to pull stock and index quotes
 description: |
   Quoter fetches online stock quotes and index data for easy display on
diff --git a/src/main/java/org/fross/quoter/Index.java b/src/main/java/org/fross/quoter/Index.java
index d4f9f5c..27357c5 100644
--- a/src/main/java/org/fross/quoter/Index.java
+++ b/src/main/java/org/fross/quoter/Index.java
@@ -43,7 +43,7 @@
 
 public class Index {
 	HashMap<String, String> indexData = new HashMap<>();
-	static boolean marketOpen;
+	private boolean marketOpen;
 	XPathLookup xPathLookup = new XPathLookup();
 
 	/**
@@ -55,6 +55,15 @@ public Index(String idx) {
 		getIndex(idx);
 	}
 
+	/**
+	 * MarketOpen(): Returns if the US index market is currently open
+	 * 
+	 * @return
+	 */
+	public boolean queryMarketOpen() {
+		return marketOpen;
+	}
+	
 	/**
 	 * queryPageItem():Find the specific value in the provided doc with the xPath given
 	 * 
diff --git a/src/main/java/org/fross/quoter/QuoteConsoleOutput.java b/src/main/java/org/fross/quoter/QuoteConsoleOutput.java
index d180cfe..fd15f9b 100644
--- a/src/main/java/org/fross/quoter/QuoteConsoleOutput.java
+++ b/src/main/java/org/fross/quoter/QuoteConsoleOutput.java
@@ -238,8 +238,8 @@ public void displayOutput(FileExporter exporter) {
 		}
 
 		// Display the open/closed status of the market
-		Output.printColor(Ansi.Color.CYAN, "\nThe US index markets are currently:  ");
-		if (Index.marketOpen == true) {
+		Output.printColor(Ansi.Color.CYAN, "\nThe US markets are currently:  ");
+		if (new Index("DOW").queryMarketOpen() == true) {
 			Output.printColorln(Ansi.Color.YELLOW, "~ OPEN ~");
 		} else {
 			Output.printColorln(Ansi.Color.YELLOW, "~ CLOSED ~");
@@ -266,7 +266,7 @@ public void displayOutput(FileExporter exporter) {
 				ZonedDateTime zdtDest = zdtSrc.withZoneSameInstant(destTimeZone);
 
 				// Build the updated time stamp
-				timeStamp = zdtDest.format(DateTimeFormatter.ofPattern("MMM dd yyyy hh:mm a z (O)"));
+				timeStamp = zdtDest.format(DateTimeFormatter.ofPattern("MMM dd yyyy hh:mma z (O)"));
 
 			} catch (DateTimeParseException ex) {
 				// Just take the original time stamp from the financial website after adding the time zone
@@ -274,6 +274,10 @@ public void displayOutput(FileExporter exporter) {
 			}
 		}
 
+		// Changed the AM/PM to lower case as I think it looks better
+		timeStamp = timeStamp.replaceAll("PM","pm");
+		timeStamp = timeStamp.replaceAll("AM","am");
+		
 		// Display the time stamp
 		Output.printColor(Ansi.Color.CYAN, "Data as of ");
 		Output.printColor(Ansi.Color.WHITE, timeStamp);