diff --git a/.moban.yml b/.moban.yml
index 0cf3b82..d87341c 100644
--- a/.moban.yml
+++ b/.moban.yml
@@ -4,7 +4,7 @@ configuration:
   - "commons/templates"
   - "setupmobans/templates"
   - ".moban.d"
-  configuration: pyexcel_io.yaml
+  configuration: pyexcel-io.yml
 targets:
   - "docs/source/conf.py": "docs/source/conf.py"
   - setup.py: setup.py
diff --git a/.travis.yml b/.travis.yml
index 2d70c31..8295c53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ notifications:
   email: false
 python:
   - pypy-5.3.1
+  - 3.7-dev
   - 3.6
   - 3.5
   - 3.4
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 24fa94e..3dd4e20 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,16 @@
 Change log
 ================================================================================
 
+0.5.8 - unreleased
+--------------------------------------------------------------------------------
+
+fixed
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#49 <https://github.com/pyexcel/pyexcel-io/issues/49>`_, support additional
+   options when detecting float values in csv format. default_float_nan,
+   ignore_nan_text
+
 0.5.7 - 02.05.2018
 --------------------------------------------------------------------------------
 
diff --git a/LICENSE b/LICENSE
index 1d5d29c..eb6ae75 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ that the following conditions are met:
   and/or other materials provided with the distribution.
 
 * Neither the name of 'pyexcel-io' nor the names of the contributors
-  may not be used to endorse or promote products derived from this software
+  may be used to endorse or promote products derived from this software
   without specific prior written permission.
 
 THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
@@ -27,4 +27,4 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
\ No newline at end of file
+DAMAGE.
diff --git a/changelog.yml b/changelog.yml
index 4c1c832..6fef98a 100644
--- a/changelog.yml
+++ b/changelog.yml
@@ -1,6 +1,12 @@
 name: pyexcel-io
 organisation: pyexcel
 releases:
+- changes:
+  - action: fixed
+    details:
+    - '`#49`, support additional options when detecting float values in csv format. default_float_nan, ignore_nan_text'
+  date: unreleased
+  version: 0.5.8
 - changes:
   - action: fixed
     details:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index cd40a61..68cf1b6 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -4,26 +4,184 @@ DESCRIPTION = (
     'format and to/from databases' +
     ''
 )
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.autosummary'
-]
-intersphinx_mapping = {
-    'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
-}
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+# -- Project information -----------------------------------------------------
 
 project = u'pyexcel-io'
 copyright = u'2015-2018 Onni Software Ltd.'
-version = '0.5.7'
-release = '0.5.7'
+author = u'C.W.'
+
+# The short X.Y version
+version = u'0.5.7'
+# The full version, including alpha/beta/rc tags
+release = u'0.5.8'
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [    'sphinx.ext.autodoc',    'sphinx.ext.doctest',    'sphinx.ext.intersphinx',    'sphinx.ext.viewcode',]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'en'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'pyexcel-iodoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'pyexcel-io.tex', u'pyexcel-io Documentation',
+     u'Onni Software Ltd.', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'pyexcel-io', u'pyexcel-io Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'pyexcel-io', u'pyexcel-io Documentation',
+     author, 'pyexcel-io', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# -- Extension configuration -------------------------------------------------
+# -- Options for intersphinx extension ---------------------------------------
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
+# TODO: html_theme not configurable upstream
 html_theme = 'default'
 
 
@@ -31,19 +189,8 @@ def setup(app):
     app.add_stylesheet('theme_overrides.css')
 
 
-html_static_path = ['_static']
-htmlhelp_basename = 'pyexcel-iodoc'
-latex_elements = {}
-latex_documents = [
-    ('index', 'pyexcel-io.tex',
-     'pyexcel-io Documentation',
-     'Onni Software Ltd.', 'manual'),
-]
-man_pages = [
-    ('index', 'pyexcel-io',
-     'pyexcel-io Documentation',
-     [u'Onni Software Ltd.'], 1)
-]
+
+# TODO: DESCRIPTION not configurable upstream
 texinfo_documents = [
     ('index', 'pyexcel-io',
      'pyexcel-io Documentation',
@@ -51,3 +198,6 @@ texinfo_documents = [
      DESCRIPTION,
      'Miscellaneous'),
 ]
+intersphinx_mapping.update({
+    'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
+})
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 7638344..5bc9765 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -10,6 +10,7 @@
 :Source code: http://github.com/pyexcel/pyexcel-io.git
 :Issues: http://github.com/pyexcel/pyexcel-io/issues
 :License: New BSD License
+:Development: |release|
 :Released: |version|
 :Generated: |today|
 
diff --git a/pyexcel_io.yaml b/pyexcel-io.yml
similarity index 92%
rename from pyexcel_io.yaml
rename to pyexcel-io.yml
index 1167c6a..a4200cb 100644
--- a/pyexcel_io.yaml
+++ b/pyexcel-io.yml
@@ -1,8 +1,8 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-io"
 nick_name: io
-version: 0.5.7
-current_version: 0.5.7
+version: 0.5.8
+current_version: 0.5.8
 release: 0.5.7
 dependencies:
   - ordereddict;python_version<"2.7"
diff --git a/setup.py b/setup.py
index 145f52b..94663fd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,6 @@
-# Template by setupmobans
+#!/usr/bin/env python3
+
+# Template by pypi-mobans
 import os
 import sys
 import codecs
@@ -9,7 +11,7 @@ PY26 = PY2 and sys.version_info[1] < 7
 
 NAME = 'pyexcel-io'
 AUTHOR = 'C.W.'
-VERSION = '0.5.7'
+VERSION = '0.5.8'
 EMAIL = 'wangc_2011@hotmail.com'
 LICENSE = 'New BSD'
 DESCRIPTION = (
@@ -20,6 +22,7 @@ URL = 'https://github.com/pyexcel/pyexcel-io'
 DOWNLOAD_URL = '%s/archive/0.5.7.tar.gz' % URL
 FILES = ['README.rst', 'CHANGELOG.rst']
 KEYWORDS = [
+    'python',
     'API',
     'tsv',
     'tsvz',
@@ -27,12 +30,9 @@ KEYWORDS = [
     'csvz',
     'django',
     'sqlalchemy',
-    'python'
 ]
 
 CLASSIFIERS = [
-    'Topic :: Office/Business',
-    'Topic :: Utilities',
     'Topic :: Software Development :: Libraries',
     'Programming Language :: Python',
     'Intended Audience :: Developers',
@@ -140,7 +140,8 @@ def read_files(*files):
 
 def read(afile):
     """Read a file into setup"""
-    with codecs.open(afile, 'r', 'utf-8') as opened_file:
+    the_relative_file = os.path.join(HERE, afile)
+    with codecs.open(the_relative_file, 'r', 'utf-8') as opened_file:
         content = filter_out_test_code(opened_file)
         content = "".join(list(content))
         return content