diff --git a/README.md b/README.md
new file mode 100644
index 0000000..35ca4f7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+Uberwriter
+==========
+
+Uberwriter is a GTK+ based distraction free Markdown editor, mainly developed by Wolf Vollprecht. It uses pandoc as backend for markdown parsing and offers a very clean and sleek user interface.
\ No newline at end of file
diff --git a/data/ui/UberwriterWindow.ui b/data/ui/UberwriterWindow.ui
index 941750b..67e0fe2 100644
--- a/data/ui/UberwriterWindow.ui
+++ b/data/ui/UberwriterWindow.ui
@@ -370,21 +370,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">5</property>
-                <child>
-                  <object class="GtkLabel" id="label_search">
-                    <property name="width_request">100</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_start">5</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Search</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="margin">5</property>
                 <child>
                   <object class="GtkSearchEntry" id="searchentrybox">
                     <property name="visible">True</property>
diff --git a/uberwriter/UberwriterSearchAndReplace.py b/uberwriter/UberwriterSearchAndReplace.py
index 6db1380..17955ee 100644
--- a/uberwriter/UberwriterSearchAndReplace.py
+++ b/uberwriter/UberwriterSearchAndReplace.py
@@ -124,7 +124,9 @@ class UberwriterSearchAndReplace():
             self.active = 0
         
         matchiter = self.matchiters[self.active]
-        self.texteditor.scroll_to_iter(matchiter[0], 0.0, True, 0.0, 0.5)
+        self.texteditor.get_buffer().select_range(matchiter[0], matchiter[1])
+
+        # self.texteditor.scroll_to_iter(matchiter[0], 0.0, True, 0.0, 0.5)
 
     def hide(self):
         self.box.hide()
diff --git a/uberwriter/UberwriterTextEditor.py b/uberwriter/UberwriterTextEditor.py
index 534a97b..cf8cde0 100644
--- a/uberwriter/UberwriterTextEditor.py
+++ b/uberwriter/UberwriterTextEditor.py
@@ -110,6 +110,9 @@ class TextEditor(Gtk.TextView):
         'redo': (GObject.SIGNAL_ACTION, None, ())
     }
 
+    def scroll_to_iter(self, iter, *args):
+        self.get_buffer().place_cursor(iter)
+
     def __init__(self):
         """
             Create a TextEditor