diff --git a/MANIFEST.in b/MANIFEST.in
index f004ce5..8ffd392 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 recursive-include config *cfg
 recursive-include doc *md
-include config *py.sample
+recursive-include config *py.sample
diff --git a/config/template.py.sample b/config/template.py.sample
index f042bc0..0857d90 100644
--- a/config/template.py.sample
+++ b/config/template.py.sample
@@ -21,10 +21,8 @@
 
 
 import os
-import timeout_decorator
 
-#@timeout_decorator.timeout(30, timeout_exception=StopIteration)
-def runAnalysisFromFiles(**kwargs):
+def runAnalysis(**kwargs):
     """
     Method that runs an analysis
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index e7b9939..16d358b 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -3,7 +3,14 @@ Project Neto's Changelog
 
 Full details of the changes committed with each version.
 
-0.6.0, 2018/05/21 -- Add t
+0.6.1, 2018/05/28 -- Add user-defined plugins
+
+- Add user-defined wrappers including a template.py for doing
+it.
+- Fix an error that occurred when Virustotal API was not 
+provided.
+
+0.6.0, 2018/05/21 -- Add Neto console interactive shell
 
 - Add `neto console` as an interactive way of dealing 
 with Neto.
diff --git a/neto/__init__.py b/neto/__init__.py
index 86df7d4..4abbc28 100644
--- a/neto/__init__.py
+++ b/neto/__init__.py
@@ -19,4 +19,4 @@
 #
 ################################################################################
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/neto/lib/extensions.py b/neto/lib/extensions.py
index b784e76..acdbea1 100644
--- a/neto/lib/extensions.py
+++ b/neto/lib/extensions.py
@@ -543,7 +543,7 @@ def analyse(self, extensionFile=None, unzippedFiles=None):
         """
         results = {}
 
-        analysisList = utils.getRunnableAnalysisFromModule("neto.plugins.analysis")
+        analysisList = utils.getRunnableAnalysisFromModule("neto.plugins.analysis") + utils.getUserAnalysisMethods()
         for methodObj in analysisList:
             results.update(methodObj(unzippedFiles=unzippedFiles, extensionFile=extensionFile))
 
diff --git a/neto/lib/utils.py b/neto/lib/utils.py
index 00292eb..a9c2b3b 100644
--- a/neto/lib/utils.py
+++ b/neto/lib/utils.py
@@ -134,7 +134,7 @@ def getUserAnalysisMethods():
     userMethods = []
 
     # Creating the application paths
-    paths = utils.getConfigPath()
+    paths = getConfigPath()
 
     newPath = os.path.abspath(paths["appPathPlugins"])