diff --git a/k3ng_keyer.ino b/k3ng_keyer.ino
index 288b6d3..4ba8fec 100644
--- a/k3ng_keyer.ino
+++ b/k3ng_keyer.ino
@@ -433,6 +433,9 @@ New fetures in this stable release:
         \)     Send serial number with cut numbers, then increment
 
 
+    2.2.2016070701
+      Corrected Nanokeyer Rev B and Rev D configurations
+
   ATTENTION: AS OF VERSION 2.2.2016012004 LIBRARY FILES MUST BE PUT IN LIBRARIES DIRECTORIES AND NOT THE INO SKETCH DIRECTORY !!!!
 
   FOR EXAMPLE: C:\USERS\ME\DOCUMENTS\ARDUINO\LIBRARIES\LIBRARY1\, C:\USERS\ME\DOCUMENTS\ARDUINO\LIBRARIES\LIBRARY2\, etc....
@@ -440,7 +443,7 @@ New fetures in this stable release:
   
 */
 
-#define CODE_VERSION "2.2.2016062101"
+#define CODE_VERSION "2.2.2016070701"
 #define eeprom_magic_number 22
 
 #include <stdio.h>
@@ -628,7 +631,7 @@ byte config_dirty = 0;
 unsigned long ptt_time = 0; 
 byte ptt_line_activated = 0;
 byte speed_mode = SPEED_NORMAL;
-#if defined(FEATURE_COMMAND_LINE_INTERFACE) || defined(FEATURE_PS2_KEYBOARD) || defined(FEATURE_MEMORY_MACROS)
+#if defined(FEATURE_COMMAND_LINE_INTERFACE) || defined(FEATURE_PS2_KEYBOARD) || defined(FEATURE_MEMORY_MACROS) || defined(FEATURE_MEMORIES)
   unsigned int serial_number = 1;
 #endif //FEATURE_COMMAND_LINE_INTERFACE
 byte pause_sending_buffer = 0;
diff --git a/keyer_features_and_options_nanokeyer_rev_b.h b/keyer_features_and_options_nanokeyer_rev_b.h
index f42be78..473a607 100644
--- a/keyer_features_and_options_nanokeyer_rev_b.h
+++ b/keyer_features_and_options_nanokeyer_rev_b.h
@@ -67,7 +67,7 @@
 //#define OPTION_USE_ORIGINAL_VERSION_2_1_PS2KEYBOARD_LIB //use version 2.1 PS2Keyboard.h and PS2Keyboard.cpp for FEATURE_PS2_KEYBOARD
 //#define OPTION_PS2_NON_ENGLISH_CHAR_LCD_DISPLAY_SUPPORT // makes some non-English characters from the PS2 keyboard display correctly in the LCD display (donated by Marcin sp5iou)
 //#define OPTION_PS2_KEYBOARD_RESET // reset the PS2 keyboard upon startup with 0xFF (contributed by Bill, W9BEL)
-//#define OPTION_SAVE_MEMORY_NANOKEYER
+#define OPTION_SAVE_MEMORY_NANOKEYER
 //#define OPTION_INVERT_PADDLE_PIN_LOGIC
 //#define OPTION_DIT_DAH_BUFFERS_OFF_BY_DEFAULT_FOR_FEATURE_DIT_DAH_BUFFER_CONTROL
 //#define OPTION_ADVANCED_SPEED_DISPLAY //enables "nerd" speed visualization on display: wpm, cpm (char per min), duration of dit and dah in milliseconds and ratio (contributed by Giorgio, IZ2XBZ)
diff --git a/keyer_features_and_options_nanokeyer_rev_d.h b/keyer_features_and_options_nanokeyer_rev_d.h
index 522e5a7..a15a171 100755
--- a/keyer_features_and_options_nanokeyer_rev_d.h
+++ b/keyer_features_and_options_nanokeyer_rev_d.h
@@ -11,7 +11,7 @@
 #define FEATURE_POTENTIOMETER         // do not enable unless you have a potentiometer connected, otherwise noise will falsely trigger wpm changes
 //#define FEATURE_SERIAL_HELP
 //#define FEATURE_HELL
-#define FEATURE_PS2_KEYBOARD        // Change keyboard layout (non-US in K3NG_PS2Keyboard.h).  Additional options below.
+// #define FEATURE_PS2_KEYBOARD        // Change keyboard layout (non-US in K3NG_PS2Keyboard.h).  Additional options below.
 //#define FEATURE_USB_KEYBOARD         
 #define FEATURE_DEAD_OP_WATCHDOG
 #define FEATURE_AUTOSPACE
@@ -65,7 +65,7 @@
 //#define OPTION_USE_ORIGINAL_VERSION_2_1_PS2KEYBOARD_LIB //use version 2.1 PS2Keyboard.h and PS2Keyboard.cpp for FEATURE_PS2_KEYBOARD
 //#define OPTION_PS2_NON_ENGLISH_CHAR_LCD_DISPLAY_SUPPORT // makes some non-English characters from the PS2 keyboard display correctly in the LCD display (donated by Marcin sp5iou)
 //#define OPTION_PS2_KEYBOARD_RESET // reset the PS2 keyboard upon startup with 0xFF (contributed by Bill, W9BEL)
-//#define OPTION_SAVE_MEMORY_NANOKEYER
+#define OPTION_SAVE_MEMORY_NANOKEYER
 //#define OPTION_INVERT_PADDLE_PIN_LOGIC
 //#define OPTION_DIT_DAH_BUFFERS_OFF_BY_DEFAULT_FOR_FEATURE_DIT_DAH_BUFFER_CONTROL
 //#define OPTION_ADVANCED_SPEED_DISPLAY //enables "nerd" speed visualization on display: wpm, cpm (char per min), duration of dit and dah in milliseconds and ratio (contributed by Giorgio, IZ2XBZ)