diff --git a/MANIFEST b/MANIFEST
index a4ce5af..afc8357 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,15 +3,15 @@ README
 setup.cfg
 setup.py
 pyFTS/__init__.py
+pyFTS/conf.py
 pyFTS/benchmarks/Measures.py
 pyFTS/benchmarks/ResidualAnalysis.py
 pyFTS/benchmarks/Util.py
 pyFTS/benchmarks/__init__.py
 pyFTS/benchmarks/arima.py
 pyFTS/benchmarks/benchmarks.py
-pyFTS/benchmarks/distributed_benchmarks.py
+pyFTS/benchmarks/knn.py
 pyFTS/benchmarks/naive.py
-pyFTS/benchmarks/parallel_benchmarks.py
 pyFTS/benchmarks/quantreg.py
 pyFTS/common/Composite.py
 pyFTS/common/FLR.py
@@ -25,8 +25,15 @@ pyFTS/common/flrg.py
 pyFTS/common/fts.py
 pyFTS/common/tree.py
 pyFTS/data/AirPassengers.py
+pyFTS/data/Bitcoin.py
+pyFTS/data/DowJones.py
+pyFTS/data/EURGBP.py
+pyFTS/data/EURUSD.py
 pyFTS/data/Enrollments.py
+pyFTS/data/Ethereum.py
+pyFTS/data/GBPUSD.py
 pyFTS/data/INMET.py
+pyFTS/data/Malaysia.py
 pyFTS/data/NASDAQ.py
 pyFTS/data/SONDA.py
 pyFTS/data/SP500.py
@@ -34,7 +41,24 @@ pyFTS/data/TAIEX.py
 pyFTS/data/__init__.py
 pyFTS/data/artificial.py
 pyFTS/data/common.py
+pyFTS/data/henon.py
+pyFTS/data/logistic_map.py
+pyFTS/data/lorentz.py
+pyFTS/data/mackey_glass.py
+pyFTS/data/rossler.py
 pyFTS/data/sunspots.py
+pyFTS/distributed/__init__.py
+pyFTS/distributed/dispy.py
+pyFTS/distributed/spark.py
+pyFTS/fcm/Activations.py
+pyFTS/fcm/GA.py
+pyFTS/fcm/__init__.py
+pyFTS/fcm/common.py
+pyFTS/fcm/fts.py
+pyFTS/hyperparam/Evolutionary.py
+pyFTS/hyperparam/GridSearch.py
+pyFTS/hyperparam/Util.py
+pyFTS/hyperparam/__init__.py
 pyFTS/models/__init__.py
 pyFTS/models/chen.py
 pyFTS/models/cheng.py
@@ -45,16 +69,25 @@ pyFTS/models/ismailefendi.py
 pyFTS/models/pwfts.py
 pyFTS/models/sadaei.py
 pyFTS/models/song.py
+pyFTS/models/tsaur.py
 pyFTS/models/yu.py
 pyFTS/models/ensemble/__init__.py
 pyFTS/models/ensemble/ensemble.py
 pyFTS/models/ensemble/multiseasonal.py
+pyFTS/models/incremental/IncrementalEnsemble.py
+pyFTS/models/incremental/TimeVariant.py
+pyFTS/models/incremental/__init__.py
 pyFTS/models/multivariate/FLR.py
 pyFTS/models/multivariate/__init__.py
+pyFTS/models/multivariate/cmvfts.py
 pyFTS/models/multivariate/common.py
 pyFTS/models/multivariate/flrg.py
+pyFTS/models/multivariate/granular.py
+pyFTS/models/multivariate/grid.py
 pyFTS/models/multivariate/mvfts.py
+pyFTS/models/multivariate/partitioner.py
 pyFTS/models/multivariate/variable.py
+pyFTS/models/multivariate/wmvfts.py
 pyFTS/models/nonstationary/__init__.py
 pyFTS/models/nonstationary/common.py
 pyFTS/models/nonstationary/cvfts.py
@@ -76,10 +109,13 @@ pyFTS/partitioners/Entropy.py
 pyFTS/partitioners/FCM.py
 pyFTS/partitioners/Grid.py
 pyFTS/partitioners/Huarng.py
+pyFTS/partitioners/Simple.py
+pyFTS/partitioners/Singleton.py
 pyFTS/partitioners/Util.py
 pyFTS/partitioners/__init__.py
 pyFTS/partitioners/parallel_util.py
 pyFTS/partitioners/partitioner.py
+pyFTS/probabilistic/Mixture.py
 pyFTS/probabilistic/ProbabilityDistribution.py
 pyFTS/probabilistic/__init__.py
 pyFTS/probabilistic/kde.py
@@ -88,8 +124,10 @@ pyFTS/tests/cmsfts.py
 pyFTS/tests/distributed.py
 pyFTS/tests/ensemble.py
 pyFTS/tests/general.py
+pyFTS/tests/hyperparam.py
 pyFTS/tests/multivariate.py
 pyFTS/tests/nonstationary.py
 pyFTS/tests/pwfts.py
 pyFTS/tests/seasonal.py
 pyFTS/tests/sfts.py
+pyFTS/tests/spark.py
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
index 9971aa7..f33ccb3 100644
Binary files a/docs/build/doctrees/environment.pickle and b/docs/build/doctrees/environment.pickle differ
diff --git a/setup.py b/setup.py
index 2b0cb42..2371cea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,18 @@
-from distutils.core import setup
+import setuptools
 
-setup(
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
     name='pyFTS',
     packages=['pyFTS', 'pyFTS.benchmarks', 'pyFTS.common', 'pyFTS.data', 'pyFTS.models.ensemble',
               'pyFTS.models', 'pyFTS.models.seasonal', 'pyFTS.partitioners', 'pyFTS.probabilistic',
               'pyFTS.tests', 'pyFTS.models.nonstationary', 'pyFTS.models.multivariate',
-              'pyFTS.models.incremental', 'pyFTS.hyperparam', 'pyFTS.distributed', 'pyFTS.fcm'],
+              'pyFTS.models.incremental', 'pyFTS.hyperparam', 'pyFTS.distributed', 'pyFTS.fcm'],	
     version='1.6',
     description='Fuzzy Time Series for Python',
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     author='Petronio Candido L. e Silva',
     author_email='petronio.candido@gmail.com',
     url='https://pyfts.github.io/pyFTS/',
@@ -18,5 +23,11 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Intended Audience :: Science/Research',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Education',
+        'Topic :: Scientific/Engineering',
+        'Development Status :: 5 - Production/Stable'
+        
     ]
 )