diff --git a/modules/gui/src/python_shell/python_syntax_highlighter.cc b/modules/gui/src/python_shell/python_syntax_highlighter.cc
index 1d2d75591de13d2d9400d8cdedcc30ca0bf1a3a8..39fd6f55b15878ed6c643add1765568a2c0ea9b2 100644
--- a/modules/gui/src/python_shell/python_syntax_highlighter.cc
+++ b/modules/gui/src/python_shell/python_syntax_highlighter.cc
@@ -44,6 +44,8 @@ PythonSyntaxHighlighter::PythonSyntaxHighlighter(QTextDocument* parent):
   formats_[PythonToken::END]=format;  
   format.setForeground(QBrush(QColor(150,0,0)));
   formats_[PythonToken::OPERATOR]=format;  
+  format.setForeground(QBrush(QColor(100,100,100)));  
+  formats_[PythonToken::COMMENT]=format;
   format.setForeground(QBrush(QColor(0,0,150)));
   formats_[PythonToken::GROUPING]=format;  
   format.setForeground(QBrush(QColor(35,107,142)));
diff --git a/modules/gui/src/python_shell/python_tokenizer.cc b/modules/gui/src/python_shell/python_tokenizer.cc
index 11126baadf515a4a2e4aed5bb1f2cca5bbc1d659..1cbbc235bea98d9a6879701fd1a77e561b6e556d 100644
--- a/modules/gui/src/python_shell/python_tokenizer.cc
+++ b/modules/gui/src/python_shell/python_tokenizer.cc
@@ -64,6 +64,8 @@ QString PythonToken::GetTypeAsString() const
     return "EOF";
   case GROUPING:
     return "grouping character";
+  case COMMENT:
+    return "comment";
   }
   return "unknown";
 }
@@ -277,6 +279,15 @@ PythonToken PythonTokenizer::NextToken()
     this->EatWhities();
     if (current_pos_ < command_.size()) {
       QChar current_char = command_[current_pos_];
+      if (current_char=='#') {
+        current_token_=PythonToken(PythonToken::COMMENT, 
+                                   Range(current_pos_, 
+                                         command_.size()-current_pos_),
+                                   command_.mid(current_pos_, 
+                                                command_.size()-current_pos_));
+        current_pos_=command_.size();
+        return current_token_;
+      }
       if (current_char.isDigit()) {
         current_token_ = GetNumberToken();
         return current_token_;
diff --git a/modules/gui/src/python_shell/python_tokenizer.hh b/modules/gui/src/python_shell/python_tokenizer.hh
index 142870da44f863085855c97d70b6ecdaff684fe9..3e85c89fe899caba8ea57832836534261faccae4 100644
--- a/modules/gui/src/python_shell/python_tokenizer.hh
+++ b/modules/gui/src/python_shell/python_tokenizer.hh
@@ -62,6 +62,7 @@ public:
     NUMBER,
     OPERATOR,
     GROUPING,
+    COMMENT,
     END
   };
   PythonToken();