diff --git a/celerybeat_status/__init__.py b/celerybeat_status/__init__.py
index b72b952..677679e 100644
--- a/celerybeat_status/__init__.py
+++ b/celerybeat_status/__init__.py
@@ -1,5 +1,5 @@
 __title__ = 'CeleryBeat Status'
-__version__ = '0.0.4'
+__version__ = '0.0.7'
 __author__ = 'Vinta Software'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2017 Vinta Serviços e Soluções Tecnológicas Ltda'
diff --git a/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html b/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html
index 3cbb679..909b905 100644
--- a/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html
+++ b/celerybeat_status/templates/celerybeat_status/periodic_tasks_status_list.html
@@ -24,7 +24,7 @@
       <ul>
         <li><strong>{% trans 'Is due?' %}</strong> {% if task.is_due %} {% trans 'Yes' %} {% else %} {% trans 'No' %} {% endif %} </li>
         <li><strong>{% trans 'Next execution:' %}</strong> {{ task.next_execution | date:"m/d/Y fa e" }}</li>
-        <li><strong>{% trans 'Task:' %}</strong> {{ task.next_execution | date:"m/d/Y fa e" }}</li>
+        <li><strong>{% trans 'Task:' %}</strong> {{ task.task }}</li>
         <li><strong>{% trans 'Arguments:' %}</strong> {{ task.args }}</li>
         <li><strong>{% trans 'Keyword Arguments:' %}</strong> {{ task.kwargs }}</li>
       </ul>
diff --git a/setup.py b/setup.py
index fc7e794..4ca7699 100755
--- a/setup.py
+++ b/setup.py
@@ -8,17 +8,13 @@
 
 from setuptools import setup
 
+long_description = ''
 try:
     from pypandoc import convert
-
-    def read_md(f):
-        return convert(f, 'rst')
+    long_description = convert('README.md', 'rst')
 except ImportError:
     print("warning: pypandoc module not found, could not convert Markdown to RST")
 
-    def read_md(f):
-        return open(f, 'r', encoding='utf-8').read()
-
 
 def get_version(package):
     """
@@ -80,7 +76,7 @@ def get_package_data(package):
     version=version,
     license='MIT',
     description='A simple django admin extension that shows when your periodic are going to run next',
-    long_description=read_md('README.md'),
+    long_description=long_description,
     author='Vinta Software',
     author_email='contact@vinta.com.br',
     packages=get_packages('celerybeat_status'),