diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100755
index 747365e5c5d943d569eee678fa2038a8eb529115..0000000000000000000000000000000000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,153 +0,0 @@
-##1.0.4
-
-Features:
-
-  - Adding support for AppConfig in INSTALLED_APPS
-
-##1.0.3
-
-Project Enhancements:
-
-  - Dropping support for Python 2
-  - Updating docs
-  - Readme updating
-  - Support for Django 2.0 (Thanks to @lachmanfrantisek)
-  
-Features:
-  
-  - Adding support to root paths (Thanks to @lucaskuzma)
-  
-BugFix:
-  
-  - Fixing backward compatibility with Django < 1.10
-
-##1.0.2
-
-Project Enhancements:
-
-  - Updating .gitignore to ignore sphinx builds
-  - Updating docs
-  - Readme enhancements
-
-##1.0.1
-
-Project Enhancements:
-
-  - Added flake8 to CI
-  - Added tox
-  - Added docs
-  - Readme enhanced
-
-BugFix:
-  
-  - Added a correction to the validators evaluation with the AND connector
-
-## 1.0.0
-
-Feature:
-
-  - Dropped support for Django < 1.8
-  - Dropped support for Python < 3.4
-  - Changed licensing from BSD to MIT
-  - Added `validators` feature
-  - Not backward compatible with versions < 1.0.0
-
-## 0.1.10
-
-Feature:
-
-  - Added `render_for_user_when_condition_is_false` feature
-
-## 0.1.9
-
-Enhancement:
-
-  - Process breadcrumbs based on nodes and not partial paths
-
-## 0.1.8
-
-BugFix:
-
-  - Properly handle `render_for_user_when_condition_is_true` submenu(s)
-
-## 0.1.7
-
-Enhancement:
-
-  - pass the `request` object to the `render_for_user_when_condition_is_true` method instead of the `user` object
-
-## 0.1.6
-
-Feature:
-
-  - Added `render_for_user_when_condition_is_true` feature
-
-## 0.1.5
-
-Enhancement:
-
-  - Updated travis to include Django 1.9
-
-
-## 0.1.4
-
-BugFix:
-
-  - Added menu `depth` to item. top-nav: depth=0, sub-nav: depth=1 etc.
-
-
-## 0.1.3
-
-BugFix:
-
-  - Skip breadcrumbs for empty list
-
-
-## 0.1.2
-
-BugFix:
-
-  - Recalculate active state for all objects, including the out-of-focus ones.
-
-
-## 0.1.1
-
-Features:
-
-  - Allow any menu name be loaded directly from the settings, bypassing MENUWARE_MENU.
-
-
-## 0.1.0
-
-Features:
-
-  - Added template tags to load up menus from the setting.py
-
-
-## 0.0.4
-
-Enhancement:
-
-  - Added usage to README
-
-
-## 0.0.3
-
-Enhancement:
-
-  - Added More Test Cases
-  - Clean up
-
-
-## 0.0.2
-
-Enhancement:
-
-  - Added Test Cases
-
-
-## 0.0.1
-
-Features:
-
-  - Initial Release
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1442e786fc66ba1d875bf99f701d3d84624a7d6d..8a7563fe1bb7fbb24559a5050e52176dac5df351 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,27 @@
 CHANGELOG
 =========
 
+1.0.4(2018-02-19)
+-----------------
+
+- Features:
+    - Adding support for AppConfig in INSTALLED_APPS
+
+1.0.3(2018-01-31)
+-----------------
+
+- Project Enhancements:
+    - Dropping support for Python 2
+    - Updating docs
+    - Readme updating
+    - Support for Django 2.0 (Thanks to @lachmanfrantisek)
+
+- Features:
+    - Adding support to root paths (Thanks to @lucaskuzma)
+
+- BugFix:
+    - Fixing backward compatibility with Django < 1.10
+
 1.0.2(2017-04-29)
 -----------------
 
@@ -19,4 +40,4 @@ CHANGELOG
 1.0.0 (2017-04-09)
 ------------------
 
-- Initial release
\ No newline at end of file
+- Initial release
diff --git a/menu_generator/__init__.py b/menu_generator/__init__.py
index 2e2d6769341452de4a76fe1868ae637592f6df53..e0c9a05763e37267c8c406f1698b5fb781eb9382 100755
--- a/menu_generator/__init__.py
+++ b/menu_generator/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'Milton Lenis'
 __description__ = 'A straightforward menu generator for Django'
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
 default_app_config = 'menu_generator.apps.MenuAppConfig'