diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..f6023b9
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,2 @@
+Hsiaoming Yang
+Steven Skoczen, @skoczen
\ No newline at end of file
diff --git a/README.md b/README.md
index b616ac7..26d8904 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ The `Editor` Class accepts an option as the parameter. The supported options are
 
 * element (DOM)
 
-  The element of the textarea. The default value is the first `<textarea>`.
+  The DOM element of the textarea, or a string selector. The default value is the first `<textarea>`.
 
 * tools (array or false)
 
@@ -99,7 +99,7 @@ Example:
 ```JavaScript
 new Editor({
   element: '#editor',
-  tools: false
+  toolbar: false
 })
 ```
 
diff --git a/src/editor.js b/src/editor.js
index 76da894..7d198e4 100644
--- a/src/editor.js
+++ b/src/editor.js
@@ -24,12 +24,18 @@ function Editor(options) {
   options = options || {};
 
   if (options.element) {
-    this.element = options.element;
+    if (typeof(options.element) == "string") {
+      this.element = document.querySelector(options.element);
+    } else {
+      this.element = options.element;
+    }
   }
 
-  options.toolbar = options.toolbar || Editor.toolbar;
   // you can customize toolbar with object
   // [{name: 'bold', shortcut: 'Ctrl-B', className: 'icon-bold'}]
+  if (!options.hasOwnProperty('toolbar')) {
+    options.toolbar = Editor.toolbar;
+  }
 
   if (!options.hasOwnProperty('status')) {
     options.status = ['lines', 'words', 'cursor'];