diff --git a/README.md b/README.md
index 733abc66..07a429da 100644
--- a/README.md
+++ b/README.md
@@ -55,179 +55,154 @@ Type: React Component
 
 Basic typeahead input and results list.
 
-#### props.options
-
-Type: `Array`
+Typeahead (props) | Type
+------------ | ------------
+| options  |  Array |
+| defaultValue  |String |
+| value |  String |
+| maxVisible |  Number|
+| resultsTruncatedMessage  |  String|
+| customClasse |  Object |
+| placeholder |  String |
+| disabled |  Boolean |
+| textarea |  Boolean |
+| inputProps | Object|
+| onKeyDown |  Function|
+| onKeyPress | Function |
+| onKeyUp |  Function|
+| onBlur| Function |
+| onFocus |  Function|
+| onOptionSelected |  Function|
+| filterOption |  String or Function |
+| displayOption |  String or Function |
+| formInputOption |  String or Function |
+| defaultClassNames | Boolean |
+| customListComponent | React Component |
+| showOptionsWhenEmpty | Boolean |
+| allowCustomValues  | Boolean |
+
+
+#### props.options 
+Type: `Array` 
 Default: []
+An array supplied to the filtering function. Can be a list of strings or a list of arbitrary objects.
+in the latter case,`filterOption` and `displayOption` should be provided.
 
-An array supplied to the filtering function. Can be a list of strings or a list of arbitrary objects. In the latter case, `filterOption` and `displayOption` should be provided.
-
-#### props.defaultValue
-
+#### props.defaultValue  
 Type: `String`
+A default value used when the component has no value. If it matches any options a option list will show.|
 
-A default value used when the component has no value. If it matches any options a option list will show.
-
-#### props.value
-
+#### props.value 
 Type: `String`
-
 Specify a value for the text input.
 
-#### props.maxVisible
-
+#### props.maxVisible 
 Type: `Number`
+Limit the number of options rendered in the results list.|
 
-Limit the number of options rendered in the results list.
-
-#### props.resultsTruncatedMessage
-
+#### props.resultsTruncatedMessage 
 Type: `String`
-
 If `maxVisible` is set, display this custom message at the bottom of the list of results when the result are truncated.
 
-#### props.customClasses
-
+#### props.customClasses 
 Type: `Object`
 Allowed Keys: `input`, `results`, `listItem`, `listAnchor`, `hover`, `typeahead`, `resultsTruncated`
-
 An object containing custom class names for child elements. Useful for
 integrating with 3rd party UI kits.
 
-#### props.placeholder
-
+#### props.placeholder 
 Type: `String`
-
 Placeholder text for the typeahead input.
 
-#### props.disabled
-
+#### props.disabled 
 Type: `Boolean`
-
 Set to `true` to add disable attribute in the `<input>` or `<textarea>` element
 
-#### props.textarea
-
+#### props.textarea 
 Type: `Boolean`
-
 Set to `true` to use a `<textarea>` element rather than an `<input>` element
 
-#### props.inputProps
-
+#### props.inputProps 
 Type: `Object`
-
 Props to pass directly to the `<input>` element.
 
-#### props.onKeyDown
-
+#### props.onKeyDown 
 Type: `Function`
-
 Event handler for the `keyDown` event on the typeahead input.
 
-#### props.onKeyPress
-
+#### props.onKeyPress 
 Type: `Function`
-
 Event handler for the `keyPress` event on the typeahead input.
 
-#### props.onKeyUp
-
+#### props.onKeyUp 
 Type: `Function`
-
 Event handler for the `keyUp` event on the typeahead input.
 
-#### props.onBlur
-
+#### props.onBlur 
 Type: `Function`
-
 Event handler for the `blur` event on the typeahead input.
 
-#### props.onFocus
-
+#### props.onFocus 
 Type: `Function`
-
 Event handler for the `focus` event on the typeahead input.
 
-#### props.onOptionSelected
-
+#### props.onOptionSelected 
 Type: `Function`
-
 Event handler triggered whenever a user picks an option.
 
-#### props.filterOption
-
+#### props.filterOption 
 Type: `String` or `Function`
-
 A function to filter the provided `options` based on the current input value. For each option, receives `(inputValue, option)`. If not supplied, defaults to [fuzzy string matching](https://github.com/mattyork/fuzzy).
-
 If provided as a string, it will interpret it as a field name and fuzzy filter on that field of each option object.
 
-#### props.displayOption
-
+#### props.displayOption 
 Type: `String` or `Function`
-
 A function to map an option onto a string for display in the list. Receives `(option, index)` where index is relative to the results list, not all the options. Must return a string.
-
 If provided as a string, it will interpret it as a field name and use that field from each option object.
 
-#### props.formInputOption
+#### props.formInputOption 
 
 Type: `String` or `Function`
-
 A function to map an option onto a string to include in HTML forms (see `props.name`). Receives `(option)` as arguments. Must return a string.
 
 If specified as a string, it will interpret it as a field name and use that field from each option object.
-
 If not specified, it will fall back onto the semantics described in `props.displayOption`.
 
 This option is ignored if you don't specify the `name` prop. It is required if you both specify the `name` prop and are using non-string options. It is optional otherwise.
 
-#### props.defaultClassNames
-
+#### props.defaultClassNames 
 Type: `boolean`
 Default: true
-
 If false, the default classNames are removed from the typeahead.
 
-#### props.customListComponent
-
+#### props.customListComponent 
 Type: `React Component`
-
 A React Component that renders the list of typeahead results. This replaces the default list of results.
-
 This component receives the following props :
 
 ##### Passed through
-
 - `props.displayOptions`
 - `props.customClasses`
 - `props.onOptionSelected`
-
 ##### Created or modified
 - `props.options`
   - This is the Typeahead's `props.options` filtered and limited to `Typeahead.props.maxVisible`.
 - `props.selectionIndex`
   - The index of the highlighted option for rendering
-
-#### props.showOptionsWhenEmpty
-
+  
+#### props.showOptionsWhenEmpty 
 Type: `boolean`
 Default: false
-
 If true, options will still be rendered when there is no value.
 
-#### props.allowCustomValues
-
+#### props.allowCustomValues 
 Type: `boolean`
-
 If true, custom tags can be added without a matching typeahead selection
-
-### Typeahead ([Exposed Component Functions][reactecf])
-
-#### typeahead.focus
-
+#### typeahead.focus 
 Focuses the typeahead input.
 
+### Typeahead | ([Exposed Component Functions][reactecf])
+
 ---
 
 ### Tokenizer(props)
@@ -236,127 +211,117 @@ Type: React Component
 
 Typeahead component that allows for multiple options to be selected.
 
-#### props.options
-
+Typeahead (props) | Type
+------------ | ------------
+| options  |  Array |
+| maxVisible | Number |
+| resultsTruncatedMessage  |  String|
+| name | String|
+| customClasse |  Object |
+| placeholder |  String |
+| disabled |  Boolean |
+| inputProps | Object|
+| onKeyDown |  Function|
+| onKeyPress | Function |
+| onKeyUp |  Function|
+| onBlur| Function |
+| onFocus |  Function|
+| defaultSelected | Array |
+| onTokenRemove | Function |
+| onTokenAdd | Function |
+| displayOption | String or Function |
+| filterOption | String or Function |
+| searchOptions | Function |
+| inputDisplayOption | String or Function |
+| formInputOption | String or Function |
+| defaultClassNames | Boolean |
+| showOptionsWhenEmpty | Boolean |
+| getSelectedTokens | Function |
+
+#### props.options 
 Type: `Array`
 Default: []
-
 An array supplied to the filter function.
 
-#### props.maxVisible
-
+#### props.maxVisible 
 Type: `Number`
-
 Limit the number of options rendered in the results list.
 
-#### props.resultsTruncatedMessage
-
+#### props.resultsTruncatedMessage 
 Type: `String`
-
 If `maxVisible` is set, display this custom message at the bottom of the list of results when the result are truncated.
 
-#### props.name
-
+#### props.name  
 Type: `String`
-
 The name for HTML forms to be used for submitting the tokens' values array.
 
-#### props.customClasses
-
+#### props.customClasses 
 Type: `Object`
 Allowed Keys: `input`, `results`, `listItem`, `listAnchor`, `hover`, `typeahead`, `resultsTruncated`, `token`
 
 An object containing custom class names for child elements. Useful for
 integrating with 3rd party UI kits.
 
-#### props.placeholder
-
+#### props.placeholder 
 Type: `String`
-
 Placeholder text for the typeahead input.
 
-#### props.disabled
-
+#### props.disabled 
 Type: `Boolean`
-
 Set to `true` to add disable attribute in the `<input>` or `<textarea>` element
 
-#### props.inputProps
-
+#### props.inputProps 
 Type: `Object`
-
 Props to pass directly to the `<input>` element.
 
-#### props.onKeyDown
-
+#### props.onKeyDown 
 Type: `Function`
-
 Event handler for the `keyDown` event on the typeahead input.
 
 #### props.onKeyPress
-
 Type: `Function`
-
 Event handler for the `keyPress` event on the typeahead input.
 
-#### props.onKeyUp
-
+#### props.onKeyUp 
 Type: `Function`
-
 Event handler for the `keyUp` event on the typeahead input.
 
-#### props.onBlur
-
+#### props.onBlur 
 Type: `Function`
-
 Event handler for the `blur` event on the typeahead input.
 
-#### props.onFocus
-
+#### props.onFocus 
 Type: `Function`
-
 Event handler for the `focus` event on the typeahead input.
 
-#### props.defaultSelected
-
+#### props.defaultSelected 
 Type: `Array`
-
 A set of values of tokens to be loaded on first render.
 
-#### props.onTokenRemove
-
+#### props.onTokenRemove 
 Type: `Function`
 Params: `(removedToken)`
-
 Event handler triggered whenever a token is removed.
 
-#### props.onTokenAdd
-
-Type: `Function`
+#### props.onTokenAdd | Type: `Function`
 Params: `(addedToken)`
 
 Event handler triggered whenever a token is added.
 
-#### props.displayOption
-
+#### props.displayOption 
 Type: `String` or `Function`
-
 A function to map an option onto a string for display in the list. Receives `(option, index)` where index is relative to the results list, not all the options. Can either return a string or a React component.
 
 If provided as a string, it will interpret it as a field name and use that field from each option object.
 
-#### props.filterOption
-
+#### props.filterOption 
 Type: `String` or `Function`
-
 A function to filter the provided `options` based on the current input value. For each option, receives `(inputValue, option)`. If not supplied, defaults to [fuzzy string matching](https://github.com/mattyork/fuzzy).
 
 If provided as a string, it will interpret it as a field name and use that field from each option object.
 
-#### props.searchOptions
-
+#### props.searchOptions 
 Type: `Function`
-
 A function to filter, map, and/or sort the provided `options` based on the current input value.
 Receives `(inputValue, options)`.
 If not supplied, defaults to [fuzzy string matching](https://github.com/mattyork/fuzzy).
@@ -364,54 +329,40 @@ If not supplied, defaults to [fuzzy string matching](https://github.com/mattyork
 Note: the function can be used to store other information besides the string in the internal state of the component.
 Make sure to use the `displayOption`, `inputDisplayOption`, and `formInputOption` props to extract/generate the correct format of data that each expects if you do this.
 
-#### props.inputDisplayOption
-
+#### props.inputDisplayOption 
 Type: `String` or `Function`
-
 A function that maps the internal state of the visible options into the value stored in the text value field of the visible input when an option is selected.
-
 Receives `(option)`.
 
 If provided as a string, it will interpret it as a field name and use that field from each option object.
-
 If no value is set, the input will be set using `displayOption` when an option is selected.
 
-#### props.formInputOption
-
+#### props.formInputOption 
 Type: `String` or `Function`
-
 A function to map an option onto a string to include in HTML forms as a hidden field (see `props.name`). Receives `(option)` as arguments. Must return a string.
 
 If specified as a string, it will interpret it as a field name and use that field from each option object.
-
 If not specified, it will fall back onto the semantics described in `props.displayOption`.
 
-#### props.defaultClassNames
-
+#### props.defaultClassNames 
 Type: `boolean`
 Default: true
-
 If false, the default classNames are removed from the tokenizer and the typeahead.
 
-#### props.showOptionsWhenEmpty
-
+#### props.showOptionsWhenEmpty 
 Type: `boolean`
 Default: false
-
 If true, options will still be rendered when there is no value.
 
-### Tokenizer ([Exposed Component Functions][reactecf])
-
-#### tokenizer.focus
-
+#### tokenizer.focus 
 Focuses the tokenizer input.
 
-#### tokenizer.getSelectedTokens
-
+#### tokenizer.getSelectedTokens 
 Type: `Function`
-
 A function to return the currently selected tokens.
 
+### Tokenizer ([Exposed Component Functions][reactecf])
+
 ## Developing
 
 ### Setting Up
diff --git a/src/typeahead/index.js b/src/typeahead/index.js
index 7e231041..88a5f503 100644
--- a/src/typeahead/index.js
+++ b/src/typeahead/index.js
@@ -202,7 +202,7 @@ var Typeahead = createReactClass({
     nEntry.value = optionString;
     this.setState({searchResults: this.getOptionsForValue(optionString, this.props.options),
                    selection: formInputOptionString,
-                   entryValue: optionString,
+                   entryValue: '',
                    showResults: false});
     return this.props.onOptionSelected(option, event);
   },