diff --git a/examples/DCCEXProtocol_Roster_etc/DCCEXProtocol_Roster_etc.ino b/examples/DCCEXProtocol_Roster_etc/DCCEXProtocol_Roster_etc.ino
index 388a86a..33b9e31 100644
--- a/examples/DCCEXProtocol_Roster_etc/DCCEXProtocol_Roster_etc.ino
+++ b/examples/DCCEXProtocol_Roster_etc/DCCEXProtocol_Roster_etc.ino
@@ -81,6 +81,17 @@ void printRoster() {
     Serial.print(" ~");
     Serial.print(name);
     Serial.println("~");
+    for (int i=0; i<32; i++) {
+      char* fName = loco->getFunctionName(i);
+      if (fName != nullptr) {
+        Serial.print("loadFunctionLabels() "); 
+        Serial.print(fName);
+        if (loco->isFunctionMomentary(i)) {
+          Serial.print(" - Momentary");
+        }
+        Serial.println();
+      }
+    }
   }
   Serial.println("\n");  
 }
diff --git a/library.properties b/library.properties
index 27ed2f1..0ab693a 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=DCCEXProtocol
-version=0.0.6
+version=0.0.7
 author=Peter Cole, Peter Akers <akersp62@gmail.com>
 maintainer=Peter Cole, Peter Akers <akersp62@gmail.com>
 sentence=DCC-EX Native Protocol implementation
diff --git a/src/DCCEXLoco.cpp b/src/DCCEXLoco.cpp
index cc2c750..fba02f8 100644
--- a/src/DCCEXLoco.cpp
+++ b/src/DCCEXLoco.cpp
@@ -121,7 +121,7 @@ void Loco::setupFunctions(char *functionNames) {
       if (momentary) {
         _momentaryFlags |= 1<<fkey;
       } else {
-        _momentaryFlags &= ~1<<fkey;
+        _momentaryFlags &= ~(1<<fkey);
       }
     }
     //  Serial.print("Function ");
@@ -153,6 +153,10 @@ char* Loco::getFunctionName(int function) {
   return _functionNames[function];
 }
 
+bool Loco::isFunctionMomentary(int function) {
+  return _momentaryFlags & 1<<function;
+}
+
 Loco* Loco::getFirst() {
   return _first;
 }
diff --git a/src/DCCEXLoco.h b/src/DCCEXLoco.h
index 91f0c12..7a67f67 100644
--- a/src/DCCEXLoco.h
+++ b/src/DCCEXLoco.h
@@ -112,6 +112,11 @@ class Loco {
   /// @return char* representing the function name/label
   char* getFunctionName(int function);
 
+  /// @brief Get the name/label for a function
+  /// @param function Number of the function to return the name/label of
+  /// @return char* representing the function name/label
+  bool isFunctionMomentary(int function);
+
   /// @brief Get first Loco object
   /// @return Pointer to the first Loco object
   static Loco* getFirst();
diff --git a/src/DCCEXProtocol.h b/src/DCCEXProtocol.h
index 01cf25a..2d95840 100644
--- a/src/DCCEXProtocol.h
+++ b/src/DCCEXProtocol.h
@@ -31,6 +31,7 @@
 /*
 Version information:
 
+0.0.6   - add isFunctionMomentary(int function);
 0.0.6   - add getFunctionName(int function);
 0.0.5   - Increase MAX_FUNCTIONS to 32. 
         - Also add check to make sure the incoming does not exceed MAX_FUNCTIONS