diff --git a/README.md b/README.md
index 05bb11a..cbac7d0 100644
--- a/README.md
+++ b/README.md
@@ -46,14 +46,24 @@ simplemde.codemirror.getValue();
 ## Configuration
 
 - **element**: The DOM element for the textarea to use. Defaults to the first textarea on the page.
-- **status**: If set false, hide the status bar. Defaults to true.
-- **toolbar**: If set false, hide the toolbar. Defaults to true.
+- **status**: If set `false`, hide the status bar. Defaults to `true`.
+- **toolbar**: If set `false`, hide the toolbar. Defaults to `true`.
+- **autofocus**: If set `true`, autofocuses the editor. Defaults to `false`.
+- **lineWrapping**: If set `false`, disable line wrapping. Defaults to `true`.
+- **lineNumbers**: If set `true`, shows line numbers. Defaults to `false`.
+- **indentWithTabs**: If set `false`, indent using spaces instead of tabs. Defaults to `true`.
+- **tabSize**: If set, customize the tab size. Defaults to `'2'`.
 
 ```
 new SimpleMDE({
 	element: document.getElementById("MyID"),
 	status: false,
 	toolbar: false,
+	autofocus: true,
+	lineWrapping: false,
+	lineNumbers: true,
+	indentWithTabs: false,
+	tabSize: '4',
 });
 ```
 
diff --git a/source files/markdownify.js b/source files/markdownify.js
index 3c73ee4..ed41cfd 100644
--- a/source files/markdownify.js	
+++ b/source files/markdownify.js	
@@ -448,8 +448,8 @@ function SimpleMDE(options) {
 		options.toolbar = [];
 	else
 		options.toolbar = options.toolbar || SimpleMDE.toolbar;
-	// you can customize toolbar with object
-	// [{name: 'bold', shortcut: 'Ctrl-B', className: 'icon-bold'}]
+		// you can customize toolbar with object
+		// [{name: 'bold', shortcut: 'Ctrl-B', className: 'icon-bold'}]
 
 	if (!options.hasOwnProperty('status')) {
 		options.status = ['lines', 'words', 'cursor'];
@@ -512,12 +512,12 @@ SimpleMDE.prototype.render = function(el) {
 	this.codemirror = CodeMirror.fromTextArea(el, {
 		mode: 'markdown',
 		theme: 'paper',
-		tabSize: '2',
-		indentWithTabs: true,
-		lineNumbers: false,
-		autofocus: false,
+		tabSize: (options.tabSize != undefined) ? options.tabSize : '2',
+		indentWithTabs: (options.indentWithTabs === false) ? false : true,
+		lineNumbers: (options.lineNumbers === true) ? true : false,
+		autofocus: (options.autofocus === true) ? true : false,
 		extraKeys: keyMaps,
-		lineWrapping: true
+		lineWrapping: (options.lineWrapping === false) ? false : true
 	});
 
 	if (options.toolbar !== false) {