diff --git a/BatteryMeter.c b/BatteryMeter.c
index 11399d46..466a525a 100644
--- a/BatteryMeter.c
+++ b/BatteryMeter.c
@@ -1,6 +1,6 @@
 /*
   htop
-  (C) 2004-2006 Hisham H. Muhammad
+  (C) 2004-2010 Hisham H. Muhammad
   Released under the GNU GPL, see the COPYING file
   in the source distribution for its full text.
 
diff --git a/BatteryMeter.h b/BatteryMeter.h
index 16633381..a3f2dd87 100644
--- a/BatteryMeter.h
+++ b/BatteryMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_BatteryMeter
 /*
   htop
-  (C) 2004-2006 Hisham H. Muhammad
+  (C) 2004-2010 Hisham H. Muhammad
   Released under the GNU GPL, see the COPYING file
   in the source distribution for its full text.
 
diff --git a/CPUMeter.c b/CPUMeter.c
index f8f738de..567cfae2 100644
--- a/CPUMeter.c
+++ b/CPUMeter.c
@@ -1,6 +1,6 @@
 /*
 htop - CPUMeter.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/CPUMeter.h b/CPUMeter.h
index 2ceb4d45..fed35d33 100644
--- a/CPUMeter.h
+++ b/CPUMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_CPUMeter
 /*
 htop - CPUMeter.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/CRT.c b/CRT.c
index 8627ec0c..22bc248c 100644
--- a/CRT.c
+++ b/CRT.c
@@ -1,6 +1,6 @@
 /*
 htop - CRT.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/CRT.h b/CRT.h
index 02ed5c4b..ef992b59 100644
--- a/CRT.h
+++ b/CRT.h
@@ -4,7 +4,7 @@
 #define HEADER_CRT
 /*
 htop - CRT.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/CheckItem.c b/CheckItem.c
index 3808f7ad..a5faddfd 100644
--- a/CheckItem.c
+++ b/CheckItem.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/CheckItem.h b/CheckItem.h
index cc1a3b0f..d1950ced 100644
--- a/CheckItem.h
+++ b/CheckItem.h
@@ -4,7 +4,7 @@
 #define HEADER_CheckItem
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ClockMeter.c b/ClockMeter.c
index 8d42b24b..5e2c20d2 100644
--- a/ClockMeter.c
+++ b/ClockMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ClockMeter.h b/ClockMeter.h
index d38619d6..581bf2b7 100644
--- a/ClockMeter.h
+++ b/ClockMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_ClockMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/FunctionBar.c b/FunctionBar.c
index 618f9307..5bd90c1e 100644
--- a/FunctionBar.c
+++ b/FunctionBar.c
@@ -1,6 +1,6 @@
 /*
 htop - FunctionBar.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/FunctionBar.h b/FunctionBar.h
index afa96fde..0285eb69 100644
--- a/FunctionBar.h
+++ b/FunctionBar.h
@@ -4,7 +4,7 @@
 #define HEADER_FunctionBar
 /*
 htop - FunctionBar.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Hashtable.c b/Hashtable.c
index 057518cc..bda7d13d 100644
--- a/Hashtable.c
+++ b/Hashtable.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Hashtable.h b/Hashtable.h
index 8dd6da48..a02ed0f8 100644
--- a/Hashtable.h
+++ b/Hashtable.h
@@ -4,7 +4,7 @@
 #define HEADER_Hashtable
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Header.c b/Header.c
index f2474c41..998e9c64 100644
--- a/Header.c
+++ b/Header.c
@@ -1,6 +1,6 @@
 /*
 htop - Header.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Header.h b/Header.h
index c87d4d0a..9ec3e802 100644
--- a/Header.h
+++ b/Header.h
@@ -4,7 +4,7 @@
 #define HEADER_Header
 /*
 htop - Header.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/HostnameMeter.c b/HostnameMeter.c
index 676f3f23..3fbd5498 100644
--- a/HostnameMeter.c
+++ b/HostnameMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/HostnameMeter.h b/HostnameMeter.h
index 49e96aa0..83319668 100644
--- a/HostnameMeter.h
+++ b/HostnameMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_HostnameMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ListItem.c b/ListItem.c
index f6d6cc5f..2568ef40 100644
--- a/ListItem.c
+++ b/ListItem.c
@@ -1,6 +1,6 @@
 /*
 htop - ListItem.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ListItem.h b/ListItem.h
index fea5db3e..cc13d73c 100644
--- a/ListItem.h
+++ b/ListItem.h
@@ -4,7 +4,7 @@
 #define HEADER_ListItem
 /*
 htop - ListItem.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
index e3eb1a78..c8e38ff6 100644
--- a/LoadAverageMeter.c
+++ b/LoadAverageMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/LoadAverageMeter.h b/LoadAverageMeter.h
index 770a0dfc..9c6e8725 100644
--- a/LoadAverageMeter.h
+++ b/LoadAverageMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_LoadAverageMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/MemoryMeter.c b/MemoryMeter.c
index e7e33160..66c4fa5c 100644
--- a/MemoryMeter.c
+++ b/MemoryMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/MemoryMeter.h b/MemoryMeter.h
index 176e8b96..16226644 100644
--- a/MemoryMeter.h
+++ b/MemoryMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_MemoryMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Meter.c b/Meter.c
index 33df6e3d..b65b0ee1 100644
--- a/Meter.c
+++ b/Meter.c
@@ -1,6 +1,6 @@
 /*
 htop - Meter.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Meter.h b/Meter.h
index 39c92768..7e6f80cb 100644
--- a/Meter.h
+++ b/Meter.h
@@ -4,7 +4,7 @@
 #define HEADER_Meter
 /*
 htop - Meter.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Object.c b/Object.c
index ac27de03..a9e99190 100644
--- a/Object.c
+++ b/Object.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Object.h b/Object.h
index 32e28aa1..87ff4d87 100644
--- a/Object.h
+++ b/Object.h
@@ -4,7 +4,7 @@
 #define HEADER_Object
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Panel.c b/Panel.c
index a9d2f60c..438cf614 100644
--- a/Panel.c
+++ b/Panel.c
@@ -1,6 +1,6 @@
 /*
 htop - Panel.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Panel.h b/Panel.h
index 859de73d..9af9ace9 100644
--- a/Panel.h
+++ b/Panel.h
@@ -4,7 +4,7 @@
 #define HEADER_Panel
 /*
 htop - Panel.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Process.c b/Process.c
index ac02de02..41c7d40d 100644
--- a/Process.c
+++ b/Process.c
@@ -1,6 +1,6 @@
 /*
 htop - Process.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Process.h b/Process.h
index 5cd8da40..6114f9c3 100644
--- a/Process.h
+++ b/Process.h
@@ -4,7 +4,7 @@
 #define HEADER_Process
 /*
 htop - Process.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ScreenManager.c b/ScreenManager.c
index a3ec8e62..2c6180d1 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/ScreenManager.h b/ScreenManager.h
index 1b80e356..9e187d08 100644
--- a/ScreenManager.h
+++ b/ScreenManager.h
@@ -4,7 +4,7 @@
 #define HEADER_ScreenManager
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Settings.c b/Settings.c
index 9a48bda2..164ef7d7 100644
--- a/Settings.c
+++ b/Settings.c
@@ -1,6 +1,6 @@
 /*
 htop - Settings.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Settings.h b/Settings.h
index 8eb575be..68d84ec8 100644
--- a/Settings.h
+++ b/Settings.h
@@ -4,7 +4,7 @@
 #define HEADER_Settings
 /*
 htop - Settings.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/SignalItem.c b/SignalItem.c
index 21b56dc3..fde1af2b 100644
--- a/SignalItem.c
+++ b/SignalItem.c
@@ -1,6 +1,6 @@
 /*
 htop - SignalItem.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/SignalItem.h b/SignalItem.h
index 865abc3f..1e929af9 100644
--- a/SignalItem.h
+++ b/SignalItem.h
@@ -4,7 +4,7 @@
 #define HEADER_SignalItem
 /*
 htop - SignalItem.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/String.c b/String.c
index 76f21f1d..6a6db94d 100644
--- a/String.c
+++ b/String.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/String.h b/String.h
index 9ffd30cf..907c50ea 100644
--- a/String.h
+++ b/String.h
@@ -4,7 +4,7 @@
 #define HEADER_String
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/SwapMeter.c b/SwapMeter.c
index a3ee0273..0f42e080 100644
--- a/SwapMeter.c
+++ b/SwapMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/SwapMeter.h b/SwapMeter.h
index 841b3782..efaab233 100644
--- a/SwapMeter.h
+++ b/SwapMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_SwapMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/TasksMeter.c b/TasksMeter.c
index f21ec82c..e82f53c7 100644
--- a/TasksMeter.c
+++ b/TasksMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/TasksMeter.h b/TasksMeter.h
index cb0c46e2..db6e4b6c 100644
--- a/TasksMeter.h
+++ b/TasksMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_TasksMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/UptimeMeter.c b/UptimeMeter.c
index 6bdf30f6..475350db 100644
--- a/UptimeMeter.c
+++ b/UptimeMeter.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/UptimeMeter.h b/UptimeMeter.h
index 6747ba72..f7b2dc69 100644
--- a/UptimeMeter.h
+++ b/UptimeMeter.h
@@ -4,7 +4,7 @@
 #define HEADER_UptimeMeter
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/UsersTable.c b/UsersTable.c
index 99d5deb2..49a51596 100644
--- a/UsersTable.c
+++ b/UsersTable.c
@@ -1,6 +1,6 @@
 /*
 htop - UsersTable.c
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/UsersTable.h b/UsersTable.h
index 489e215c..cd697936 100644
--- a/UsersTable.h
+++ b/UsersTable.h
@@ -4,7 +4,7 @@
 #define HEADER_UsersTable
 /*
 htop - UsersTable.h
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Vector.c b/Vector.c
index a4c03df4..76d74e5b 100644
--- a/Vector.c
+++ b/Vector.c
@@ -1,6 +1,6 @@
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/Vector.h b/Vector.h
index d04f9a5c..0ebea031 100644
--- a/Vector.h
+++ b/Vector.h
@@ -4,7 +4,7 @@
 #define HEADER_Vector
 /*
 htop
-(C) 2004-2006 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
diff --git a/configure.ac b/configure.ac
index 59ca6e07..bb6767f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([htop],[0.8.3],[loderunner@users.sourceforge.net])
+AC_INIT([htop],[0.8.4],[loderunner@users.sourceforge.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([htop.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/htop.h b/htop.h
index b1c69a28..86533e57 100644
--- a/htop.h
+++ b/htop.h
@@ -4,7 +4,7 @@
 #define HEADER_htop
 /*
 htop - htop.h
-(C) 2004-2008 Hisham H. Muhammad
+(C) 2004-2010 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
@@ -16,6 +16,7 @@ in the source distribution for its full text.
 #include <ctype.h>
 #include <stdbool.h>
 #include <locale.h>
+#include <getopt.h>
 
 #include "ProcessList.h"
 #include "CRT.h"
@@ -40,6 +41,8 @@ in the source distribution for its full text.
 
 #define INCSEARCH_MAX 40
 
+#define COPYRIGHT "(C) 2004-2010 Hisham Muhammad"
+
 int main(int argc, char** argv);
 
 #endif