diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py
index 6101fe41d..6fbc74b83 100644
--- a/src/Selenium2Library/keywords/_browsermanagement.py
+++ b/src/Selenium2Library/keywords/_browsermanagement.py
@@ -154,7 +154,10 @@ def select_frame(self, locator):
         details about locating elements.
         """
         self._info("Selecting frame '%s'." % locator)
-        element = self._element_find(locator, True, True, tag='frame')
+        try:
+            element = self._element_find(locator, True, True, tag='iframe')
+        except ValueError:
+            element = self._element_find(locator, True, True, tag='frame')
         self._current_browser().switch_to_frame(element)
 
     def select_window(self, locator=None):
@@ -366,4 +369,3 @@ def _make_browser(self, browser_name):
         browser.set_script_timeout(self._timeout_in_secs)
 
         return browser
-
diff --git a/src/Selenium2Library/keywords/_element.py b/src/Selenium2Library/keywords/_element.py
index 1fd2b764a..1a6cdc469 100644
--- a/src/Selenium2Library/keywords/_element.py
+++ b/src/Selenium2Library/keywords/_element.py
@@ -228,6 +228,13 @@ def get_value(self, locator):
         See `introduction` for details about locating elements.
         """
         return self._get_value(locator)
+        
+    def get_text(self, locator):
+        """Returns the text value of element identified by `locator`.
+
+        See `introduction` for details about locating elements.
+        """
+        return self._get_text(locator)
 
     def get_vertical_position(self, locator):
         """Returns vertical position of element identified by `locator`.
@@ -507,7 +514,10 @@ def _element_find(self, locator, first_only, required, tag=None):
 
     def _frame_contains(self, locator, text):
         browser = self._current_browser()
-        element = self._element_find(locator, True, True, 'frame')
+        try:
+            element = self._element_find(locator, True, True, tag='iframe')
+        except ValueError:
+            element = self._element_find(locator, True, True, tag='frame')
         browser.switch_to_frame(element)
         self._info("Searching for text from frame '%s'." % locator)
         found = self._is_text_present(text)
@@ -588,7 +598,10 @@ def _page_contains(self, text):
         if self._is_text_present(text):
             return True
 
-        subframes = self._element_find("tag=frame", False, False, 'frame')
+        try:
+            subframes = self._element_find("tag=iframe", False, False, 'iframe')
+        except ValueError:
+            subframes = self._element_find("tag=frame", False, False, 'frame')
         self._debug('Current frame has %d subframes' % len(subframes))
         for frame in subframes:
             browser.switch_to_frame(frame)
@@ -619,4 +632,3 @@ def _page_should_not_contain_element(self, locator, tag, message, loglevel):
             raise AssertionError(message)
         self._info("Current page does not contain %s '%s'."
                    % (element_name, locator))
-