diff --git a/PageObjectLibrary/__init__.py b/PageObjectLibrary/__init__.py
index 553632c..1c785a2 100644
--- a/PageObjectLibrary/__init__.py
+++ b/PageObjectLibrary/__init__.py
@@ -54,7 +54,7 @@ class your keywords have access to the following pre-defined
     standard Selenium methods provided by the Selenium library. The
     following example shows how to find all link elements on a page:
 
-    | elements = self.browser,find_elements_by_tag_name("a")
+    | elements = self.browser.find_elements(By.TAG_NAME, "a")
 
     = Creating Page Object Classes =
 
diff --git a/PageObjectLibrary/pageobject.py b/PageObjectLibrary/pageobject.py
index b6df59d..9b55bc0 100644
--- a/PageObjectLibrary/pageobject.py
+++ b/PageObjectLibrary/pageobject.py
@@ -9,6 +9,7 @@
 
 from selenium.webdriver.support.expected_conditions import staleness_of
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
 
 import six
 
@@ -91,7 +92,7 @@ def _wait_for_page_refresh(self, timeout=10):
         2) the javascript document.readyState variable to be set
            to "complete"
         """
-        old_page = self.browser.find_element_by_tag_name('html')
+        old_page = self.browser.find_element(By.TAG_NAME, 'html')
         yield
         WebDriverWait(self.browser, timeout).until(
             staleness_of(old_page),
diff --git a/doc/pageobjectlibrary.html b/doc/pageobjectlibrary.html
index d688e9d..b064d15 100644
--- a/doc/pageobjectlibrary.html
+++ b/doc/pageobjectlibrary.html
@@ -548,7 +548,7 @@
 jQuery.extend({highlight:function(e,t,n,r){if(e.nodeType===3){var i=e.data.match(t);if(i){var s=document.createElement(n||"span");s.className=r||"highlight";var o=e.splitText(i.index);o.splitText(i[0].length);var u=o.cloneNode(true);s.appendChild(u);o.parentNode.replaceChild(s,o);return 1}}else if(e.nodeType===1&&e.childNodes&&!/(script|style)/i.test(e.tagName)&&!(e.tagName===n.toUpperCase()&&e.className===r)){for(var a=0;a<e.childNodes.length;a++){a+=jQuery.highlight(e.childNodes[a],t,n,r)}}return 0}});jQuery.fn.unhighlight=function(e){var t={className:"highlight",element:"span"};jQuery.extend(t,e);return this.find(t.element+"."+t.className).each(function(){var e=this.parentNode;e.replaceChild(this.firstChild,this);e.normalize()}).end()};jQuery.fn.highlight=function(e,t){var n={className:"highlight",element:"span",caseSensitive:false,wordsOnly:false};jQuery.extend(n,t);if(e.constructor===String){e=[e]}e=jQuery.grep(e,function(e,t){return e!=""});e=jQuery.map(e,function(e,t){return e.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")});if(e.length==0){return this}var r=n.caseSensitive?"":"i";var i="("+e.join("|")+")";if(n.wordsOnly){i="\\b"+i+"\\b"}var s=new RegExp(i,r);return this.each(function(){jQuery.highlight(this,s,n.element,n.className)})}
 </script>
 <script type="text/javascript">
-libdoc = {"all_tags":["page-object","selenium"],"contains_tags":true,"doc":"<p>This project is hosted on github in the repository <a href=\"https://github.com/boakley/robotframework-pageobjectlibrary\">boakley/robotframework-pageobjectlibrary\x3c/a>\x3c/p>\n<p><b>PageObjectLibrary\x3c/b> is a lightweight library which supports using the page object pattern with <a href=\"http://robotframework.org/Selenium2Library/doc/Selenium2Library.html\">Selenium2Library\x3c/a>. This library does not replace Selenium2Library; rather, it provides a framework around which to use Selenium2Library and the lower-level <a href=\"http://selenium-python.readthedocs.org/\">Python bindings to Selenium\x3c/a>\x3c/p>\n<p>This library provides the following keywords:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Keyword Name\x3c/th>\n<th>Synopsis\x3c/th>\n\x3c/tr>\n<tr>\n<td>Go to page\x3c/td>\n<td>Goes to the given page in the browser\x3c/td>\n\x3c/tr>\n<tr>\n<td>The current page should be\x3c/td>\n<td>Assert that the given page is displayed in the browser\x3c/td>\n\x3c/tr>\n<tr>\n<td>Get page name\x3c/td>\n<td>Returns the name of the current page\x3c/td>\n\x3c/tr>\n\x3c/table>\n<p>PageObjectLibrary provides a PageObject class which should be used as the base class for other page objects. By inheriting from this class your keywords have access to the following pre-defined attributes and methods:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Attribute/method\x3c/th>\n<th>Description\x3c/th>\n\x3c/tr>\n<tr>\n<td><code>self.se2lib\x3c/code>\x3c/td>\n<td>A reference to the Selenium2Library instance\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.browser\x3c/code>\x3c/td>\n<td>A reference to the currently open browser\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.locator\x3c/code>\x3c/td>\n<td>A wrapper around the <code>_locators\x3c/code> dictionary\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.logger\x3c/code>\x3c/td>\n<td>A reference to the <code>robot.api.logger\x3c/code> instance\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self._wait_for_page_refresh()\x3c/code>\x3c/td>\n<td>a context manager for doing work that causes a page refresh\x3c/td>\n\x3c/tr>\n\x3c/table>\n<h2 id=\"Using Selenium2Library Keywords\">Using Selenium2Library Keywords\x3c/h2>\n<p>Within your keywords you have access to the full power of Selenium2Library. You can use <code>self.se2lib\x3c/code> to access the library keywords. The following example shows how to call the <code>Capture Page Screenshot\x3c/code> keyword:\x3c/p>\n<pre>\nself.se2lib.capture_page_screenshot()\n\x3c/pre>\n<h2 id=\"Using Selenium Methods\">Using Selenium Methods\x3c/h2>\n<p>The attribute <code>self.browser\x3c/code> is a reference to a Selenium webdriver object. With this reference you can call any of the standard Selenium methods provided by the Selenium library. The following example shows how to find all link elements on a page:\x3c/p>\n<pre>\nelements = self.browser,find_elements_by_tag_name(\"a\")\n\x3c/pre>\n<h2 id=\"Creating Page Object Classes\">Creating Page Object Classes\x3c/h2>\n<p>Page objects should inherit from PageObjectLibrary.PageObject. At a minimum, the class should define the following attributes:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Attribute\x3c/th>\n<th>Description\x3c/th>\n\x3c/tr>\n<tr>\n<td><code>PAGE_URL\x3c/code>\x3c/td>\n<td>The path to the current page, without the     hostname and port (eg: <code>/dashboard.html\x3c/code>)\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>PAGE_TITLE\x3c/code>\x3c/td>\n<td>The web page title. This is used by the     default implementation of <code>_is_current_page\x3c/code>.\x3c/td>\n\x3c/tr>\n\x3c/table>\n<p>When using the keywords <a href=\"#Go%20To%20Page\" class=\"name\">Go To Page\x3c/a> or <a href=\"#The%20Current%20Page%20Should%20Be\" class=\"name\">The Current Page Should Be\x3c/a>, the PageObjectLibrary will call the method <code>_is_current_page\x3c/code> of the given page. By default this will compare the current page title to the <code>PAGE_TITLE\x3c/code> attribute of the page. If you are working on a site where the page titles are not unique, you can override this method to do any type of logic you need.\x3c/p>\n<h2 id=\"Page Objects are Normal Robot Libraries\">Page Objects are Normal Robot Libraries\x3c/h2>\n<p>All rules that apply to keyword libraries applies to page objects. For example, the libraries must be on <code>PYTHONPATH\x3c/code>. You may also want to define <code>ROBOT_LIBRARY_SCOPE\x3c/code>. Also, the filename and the classname must be identical (minus the <code>.py\x3c/code> suffix on the file).\x3c/p>\n<h2 id=\"Locators\">Locators\x3c/h2>\n<p>When writing multiple keywords for a page, you often use the same locators in many places. PageObject allows you to define your locators in a dictionary, but them use them with a more convenient dot notation.\x3c/p>\n<p>To define locators, create a dictionary named <code>_locators\x3c/code>. You can then access the locators via dot notation within your keywords as <code>self.locator.&lt;name&gt;\x3c/code>. The <code>_locators\x3c/code> dictionary may have nested dictionaries.\x3c/p>\n<h2 id=\"Waiting for a Page to be Ready\">Waiting for a Page to be Ready\x3c/h2>\n<p>One difficulty with writing Selenium tests is knowing when a page has refreshed. PageObject provides a context manager named <code>_wait_for_page_refresh()\x3c/code> which can be used to wrap a command that should result in a page refresh. It will get a reference to the DOM, run the body of the context manager, and then wait for the DOM to change before returning.\x3c/p>\n<h2 id=\"Example Page Object Definition\">Example Page Object Definition\x3c/h2>\n<pre>\nfrom PageObjectLibrary import PageObject\nfrom robot.libraries.BuiltIn import BuiltIn\n\nclass LoginPage(PageObject):\n    PAGE_TITLE = \"Login - PageObjectLibrary Demo\"\n    PAGE_URL = \"/\"\n\n   _locators = {\n       \"username\": \"id=id_username\",\n       \"password\": \"id=id_password\",\n       \"submit_button\": \"id=id_submit\",\n   }\n\n   def login_as_a_normal_user(self):\n       username = BuiltIn().get_variable_value(\"${USERNAME}\"}\n       password = BuiltIn().get_variable_value(\"${PASSWORD}\"}\n       self.se2lib.input_text(self.locator.username, username)\n       self.se2lib.input_text(self.locator.password, password)\n\n       with self._wait_for_page_refresh():\n           self.click_the_submit_button()\n\x3c/pre>\n<h2 id=\"Using the Page Object in a Test\">Using the Page Object in a Test\x3c/h2>\n<p>To use the above page object in a test, you must make sure that Robot can import it, just like with any other keyword library. When you use the keyword <a href=\"#Go%20To%20Page\" class=\"name\">Go to page\x3c/a>, the keyword will automatically load the keyword library and put it at the front of the Robot Framework library search order (see <a href=\"http://robotframework.org/robotframework/latest/libraries/BuiltIn.html#Set%20Library%20Search%20Order\">Set Library Search Order\x3c/a>)\x3c/p>\n<p>In the following example it is assumed there is a second page object named <code>DashboardPage\x3c/code> which the browser is expected to go to if login is successful.\x3c/p>\n<pre>\n<code>*** Settings ***\x3c/code>\nLibrary           PageObjectLibrary\nLibrary           Selenium2Library\nSuite Setup       Open browser        <a href=\"http://www.example.com\">http://www.example.com\x3c/a>\nSuite Teardown    Close all browsers\n\n<code>*** Test Cases ***\x3c/code>\nLog in to the application\n    Go to page                   LoginPage\n    Log in as a normal user\n    The current page should be   DashboardPage\n\x3c/pre>","generated":"2017-08-15 13:07:35","inits":[],"keywords":[{"args":["page_name","page_root=None"],"doc":"<p>Go to the url for the given page object.\x3c/p>\n<p>Unless explicitly provided, the URL root will be based on the root of the current page. For example, if the current page is <a href=\"http://www.example.com:8080\">http://www.example.com:8080\x3c/a> and the page object URL is <code>/login\x3c/code>, the url will be <a href=\"http://www.example.com:8080/login\">http://www.example.com:8080/login\x3c/a>\x3c/p>\n<h3>Example\x3c/h3>\n<p>Given a page object named <code>ExampleLoginPage\x3c/code> with the URL <code>/login\x3c/code>, and a browser open to <code>http://www.example.com\x3c/code>, the following statement will go to <code>http://www.example.com/login\x3c/code>, and place <code>ExampleLoginPage\x3c/code> at the front of Robot's library search order.\x3c/p>\n<pre>\nGo to Page    ExampleLoginPage\n\x3c/pre>\n<p>The effect is the same as if you had called the following three keywords:\x3c/p>\n<pre>\nSelenium2Library.Go To      <a href=\"http://www.example.com/login\">http://www.example.com/login\x3c/a>\nImport Library              ExampleLoginPage\nSet Library Search Order    ExampleLoginPage\n\x3c/pre>","matched":true,"name":"Go To Page","shortdoc":"Go to the url for the given page object.","tags":["page-object","selenium"]},{"args":["page_name"],"doc":"<p>Fails if the name of the current page is not the given page name\x3c/p>\n<p><code>page_name\x3c/code> is the name you would use to import the page.\x3c/p>\n<p>This keyword will import the given page object, put it at the front of the Robot library search order, then call the method <code>_is_current_page\x3c/code> on the library. The default implementation of this method will compare the page title to the <code>PAGE_TITLE\x3c/code> attribute of the page object, but this implementation can be overridden by each page object.\x3c/p>","matched":true,"name":"The Current Page Should Be","shortdoc":"Fails if the name of the current page is not the given page name","tags":[]}],"name":"PageObjectLibrary","named_args":true,"scope":"test suite","version":""};
+libdoc = {"all_tags":["page-object","selenium"],"contains_tags":true,"doc":"<p>This project is hosted on github in the repository <a href=\"https://github.com/boakley/robotframework-pageobjectlibrary\">boakley/robotframework-pageobjectlibrary\x3c/a>\x3c/p>\n<p><b>PageObjectLibrary\x3c/b> is a lightweight library which supports using the page object pattern with <a href=\"http://robotframework.org/Selenium2Library/doc/Selenium2Library.html\">Selenium2Library\x3c/a>. This library does not replace Selenium2Library; rather, it provides a framework around which to use Selenium2Library and the lower-level <a href=\"http://selenium-python.readthedocs.org/\">Python bindings to Selenium\x3c/a>\x3c/p>\n<p>This library provides the following keywords:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Keyword Name\x3c/th>\n<th>Synopsis\x3c/th>\n\x3c/tr>\n<tr>\n<td>Go to page\x3c/td>\n<td>Goes to the given page in the browser\x3c/td>\n\x3c/tr>\n<tr>\n<td>The current page should be\x3c/td>\n<td>Assert that the given page is displayed in the browser\x3c/td>\n\x3c/tr>\n<tr>\n<td>Get page name\x3c/td>\n<td>Returns the name of the current page\x3c/td>\n\x3c/tr>\n\x3c/table>\n<p>PageObjectLibrary provides a PageObject class which should be used as the base class for other page objects. By inheriting from this class your keywords have access to the following pre-defined attributes and methods:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Attribute/method\x3c/th>\n<th>Description\x3c/th>\n\x3c/tr>\n<tr>\n<td><code>self.se2lib\x3c/code>\x3c/td>\n<td>A reference to the Selenium2Library instance\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.browser\x3c/code>\x3c/td>\n<td>A reference to the currently open browser\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.locator\x3c/code>\x3c/td>\n<td>A wrapper around the <code>_locators\x3c/code> dictionary\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self.logger\x3c/code>\x3c/td>\n<td>A reference to the <code>robot.api.logger\x3c/code> instance\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>self._wait_for_page_refresh()\x3c/code>\x3c/td>\n<td>a context manager for doing work that causes a page refresh\x3c/td>\n\x3c/tr>\n\x3c/table>\n<h2 id=\"Using Selenium2Library Keywords\">Using Selenium2Library Keywords\x3c/h2>\n<p>Within your keywords you have access to the full power of Selenium2Library. You can use <code>self.se2lib\x3c/code> to access the library keywords. The following example shows how to call the <code>Capture Page Screenshot\x3c/code> keyword:\x3c/p>\n<pre>\nself.se2lib.capture_page_screenshot()\n\x3c/pre>\n<h2 id=\"Using Selenium Methods\">Using Selenium Methods\x3c/h2>\n<p>The attribute <code>self.browser\x3c/code> is a reference to a Selenium webdriver object. With this reference you can call any of the standard Selenium methods provided by the Selenium library. The following example shows how to find all link elements on a page:\x3c/p>\n<pre>\nelements = self.browser,find_elements(By.TAG_NAME, \"a\")\n\x3c/pre>\n<h2 id=\"Creating Page Object Classes\">Creating Page Object Classes\x3c/h2>\n<p>Page objects should inherit from PageObjectLibrary.PageObject. At a minimum, the class should define the following attributes:\x3c/p>\n<table border=\"1\">\n<tr>\n<th>Attribute\x3c/th>\n<th>Description\x3c/th>\n\x3c/tr>\n<tr>\n<td><code>PAGE_URL\x3c/code>\x3c/td>\n<td>The path to the current page, without the     hostname and port (eg: <code>/dashboard.html\x3c/code>)\x3c/td>\n\x3c/tr>\n<tr>\n<td><code>PAGE_TITLE\x3c/code>\x3c/td>\n<td>The web page title. This is used by the     default implementation of <code>_is_current_page\x3c/code>.\x3c/td>\n\x3c/tr>\n\x3c/table>\n<p>When using the keywords <a href=\"#Go%20To%20Page\" class=\"name\">Go To Page\x3c/a> or <a href=\"#The%20Current%20Page%20Should%20Be\" class=\"name\">The Current Page Should Be\x3c/a>, the PageObjectLibrary will call the method <code>_is_current_page\x3c/code> of the given page. By default this will compare the current page title to the <code>PAGE_TITLE\x3c/code> attribute of the page. If you are working on a site where the page titles are not unique, you can override this method to do any type of logic you need.\x3c/p>\n<h2 id=\"Page Objects are Normal Robot Libraries\">Page Objects are Normal Robot Libraries\x3c/h2>\n<p>All rules that apply to keyword libraries applies to page objects. For example, the libraries must be on <code>PYTHONPATH\x3c/code>. You may also want to define <code>ROBOT_LIBRARY_SCOPE\x3c/code>. Also, the filename and the classname must be identical (minus the <code>.py\x3c/code> suffix on the file).\x3c/p>\n<h2 id=\"Locators\">Locators\x3c/h2>\n<p>When writing multiple keywords for a page, you often use the same locators in many places. PageObject allows you to define your locators in a dictionary, but them use them with a more convenient dot notation.\x3c/p>\n<p>To define locators, create a dictionary named <code>_locators\x3c/code>. You can then access the locators via dot notation within your keywords as <code>self.locator.&lt;name&gt;\x3c/code>. The <code>_locators\x3c/code> dictionary may have nested dictionaries.\x3c/p>\n<h2 id=\"Waiting for a Page to be Ready\">Waiting for a Page to be Ready\x3c/h2>\n<p>One difficulty with writing Selenium tests is knowing when a page has refreshed. PageObject provides a context manager named <code>_wait_for_page_refresh()\x3c/code> which can be used to wrap a command that should result in a page refresh. It will get a reference to the DOM, run the body of the context manager, and then wait for the DOM to change before returning.\x3c/p>\n<h2 id=\"Example Page Object Definition\">Example Page Object Definition\x3c/h2>\n<pre>\nfrom PageObjectLibrary import PageObject\nfrom robot.libraries.BuiltIn import BuiltIn\n\nclass LoginPage(PageObject):\n    PAGE_TITLE = \"Login - PageObjectLibrary Demo\"\n    PAGE_URL = \"/\"\n\n   _locators = {\n       \"username\": \"id=id_username\",\n       \"password\": \"id=id_password\",\n       \"submit_button\": \"id=id_submit\",\n   }\n\n   def login_as_a_normal_user(self):\n       username = BuiltIn().get_variable_value(\"${USERNAME}\"}\n       password = BuiltIn().get_variable_value(\"${PASSWORD}\"}\n       self.se2lib.input_text(self.locator.username, username)\n       self.se2lib.input_text(self.locator.password, password)\n\n       with self._wait_for_page_refresh():\n           self.click_the_submit_button()\n\x3c/pre>\n<h2 id=\"Using the Page Object in a Test\">Using the Page Object in a Test\x3c/h2>\n<p>To use the above page object in a test, you must make sure that Robot can import it, just like with any other keyword library. When you use the keyword <a href=\"#Go%20To%20Page\" class=\"name\">Go to page\x3c/a>, the keyword will automatically load the keyword library and put it at the front of the Robot Framework library search order (see <a href=\"http://robotframework.org/robotframework/latest/libraries/BuiltIn.html#Set%20Library%20Search%20Order\">Set Library Search Order\x3c/a>)\x3c/p>\n<p>In the following example it is assumed there is a second page object named <code>DashboardPage\x3c/code> which the browser is expected to go to if login is successful.\x3c/p>\n<pre>\n<code>*** Settings ***\x3c/code>\nLibrary           PageObjectLibrary\nLibrary           Selenium2Library\nSuite Setup       Open browser        <a href=\"http://www.example.com\">http://www.example.com\x3c/a>\nSuite Teardown    Close all browsers\n\n<code>*** Test Cases ***\x3c/code>\nLog in to the application\n    Go to page                   LoginPage\n    Log in as a normal user\n    The current page should be   DashboardPage\n\x3c/pre>","generated":"2017-08-15 13:07:35","inits":[],"keywords":[{"args":["page_name","page_root=None"],"doc":"<p>Go to the url for the given page object.\x3c/p>\n<p>Unless explicitly provided, the URL root will be based on the root of the current page. For example, if the current page is <a href=\"http://www.example.com:8080\">http://www.example.com:8080\x3c/a> and the page object URL is <code>/login\x3c/code>, the url will be <a href=\"http://www.example.com:8080/login\">http://www.example.com:8080/login\x3c/a>\x3c/p>\n<h3>Example\x3c/h3>\n<p>Given a page object named <code>ExampleLoginPage\x3c/code> with the URL <code>/login\x3c/code>, and a browser open to <code>http://www.example.com\x3c/code>, the following statement will go to <code>http://www.example.com/login\x3c/code>, and place <code>ExampleLoginPage\x3c/code> at the front of Robot's library search order.\x3c/p>\n<pre>\nGo to Page    ExampleLoginPage\n\x3c/pre>\n<p>The effect is the same as if you had called the following three keywords:\x3c/p>\n<pre>\nSelenium2Library.Go To      <a href=\"http://www.example.com/login\">http://www.example.com/login\x3c/a>\nImport Library              ExampleLoginPage\nSet Library Search Order    ExampleLoginPage\n\x3c/pre>","matched":true,"name":"Go To Page","shortdoc":"Go to the url for the given page object.","tags":["page-object","selenium"]},{"args":["page_name"],"doc":"<p>Fails if the name of the current page is not the given page name\x3c/p>\n<p><code>page_name\x3c/code> is the name you would use to import the page.\x3c/p>\n<p>This keyword will import the given page object, put it at the front of the Robot library search order, then call the method <code>_is_current_page\x3c/code> on the library. The default implementation of this method will compare the page title to the <code>PAGE_TITLE\x3c/code> attribute of the page object, but this implementation can be overridden by each page object.\x3c/p>","matched":true,"name":"The Current Page Should Be","shortdoc":"Fails if the name of the current page is not the given page name","tags":[]}],"name":"PageObjectLibrary","named_args":true,"scope":"test suite","version":""};
 </script>
 <title></title>
 </head>