diff --git a/samples/python2/camshift.py b/samples/python2/camshift.py
index 1b4a678bd5..1973bb8310 100644
--- a/samples/python2/camshift.py
+++ b/samples/python2/camshift.py
@@ -1,16 +1,29 @@
-import numpy as np
-import cv2
-import video
+'''
+Camshift tracker
+================
+
+This is a demo that shows mean-shift based tracking
+You select a color objects such as your face and it tracks it.
+This reads from video camera (0 by default, or the camera number the user enters)
 
-help_message = '''USAGE: camshift.py [<video source>]
+http://www.robinhewitt.com/research/track/camshift.html
 
-Select a bright colored object to track.
+Usage:
+------
+    camshift.py [<video source>]
 
+    To initialize tracking, select the object with mouse
+  
 Keys:
-  ESC   - exit
-  b     - toggle back-projected probability visualization
+-----
+    ESC   - exit
+    b     - toggle back-projected probability visualization
 '''
 
+import numpy as np
+import cv2
+import video
+
 
 class App(object):
     def __init__(self, video_src):
@@ -99,6 +112,6 @@ if __name__ == '__main__':
     import sys
     try: video_src = sys.argv[1]
     except: video_src = 0
-    print help_message
+    print __doc__
     App(video_src).run()
 
diff --git a/samples/python2/demo.py b/samples/python2/demo.py
index c8bdcd9f30..f9fc977200 100644
--- a/samples/python2/demo.py
+++ b/samples/python2/demo.py
@@ -124,12 +124,12 @@ class App:
                 text.tag_add(tag, start, end)
         self.match_text(r'http://\S+', add_link)
 
-    def match_text(self, pattern, tag_proc):
+    def match_text(self, pattern, tag_proc, regexp=True):
         text = self.text
         text.mark_set('matchPos', '1.0')
         count = tk.IntVar()
         while True:
-            match_index = text.search(pattern, 'matchPos', count=count, regexp=True, stopindex='end')
+            match_index = text.search(pattern, 'matchPos', count=count, regexp=regexp, stopindex='end')
             if not match_index: break
             end_index = text.index( "%s+%sc" % (match_index, count.get()) )
             text.mark_set('matchPos', end_index)