diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c7aa45c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 1.0 (17th Dec 2013)
+
+  - Password change functionality when using DB or LDAP plugin
\ No newline at end of file
diff --git a/README.md b/README.md
index bd2fea4..12f0bda 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,38 @@
 zarafa-webapp-passwd
 ====================
 
-Plugin to add functionality of changing of password from zarafa webapp
+The Passwd plugin allows the user to change his password inside of WebApp.
 
-This plugin is largely based on the "Passwd" plugin by
-Andreas Brodowski. For his original check this link https://community.zarafa.com/pg/plugins/project/157/developer/dw2412/passwd-plugin
\ No newline at end of file
+This plugin is largely based on the "Passwd" plugin by Andreas Brodowski.
+For his original work check this [link](https://community.zarafa.com/pg/plugins/project/157/developer/dw2412/passwd-plugin)
+
+## How to install
+1. If you want to use this plugin with production / debug version of webapp then please download package from [community](__link_to_come__)
+2. If you want to use this plugin with source copy of webapp then you can just download this whole project
+3. Extract contents of this plugin to <webapp_path>/plugins directory
+4. Give read permissions to apache for <webapp_path>/plugins/passwd directory
+5. If you are using LDAP plugin then change PLUGIN_PASSWD_LDAP to true and also set proper values for PLUGIN_PASSWD_LDAP_BASEDN and PLUGIN_PASSWD_LDAP_URI configurations
+6. If you are using DB plugin then no need to change anything, default configurations should be fine
+5. Restart apache, reload webapp after clearing cache
+6. If you want to enable this plugin by default for all users then edit config.php file and change PLUGIN_PASSWD_USER_DEFAULT_ENABLE setting to true
+
+## How to enable
+1. Go to settings section
+2. Go to Plugins tab
+3. Enable password change plugin and reload webapp
+4. Go to Change Password tab of settings section
+5. Provide current password and new password
+6. Click on apply
+
+## How to disable
+1. Go to settings section
+2. Go to Plugins tab
+3. Disable password change plugin and reload webapp
+
+## Notes
+- Feedback/Bug Reports are welcome
+- if anyone is good at creating icons then please help me add a good icon to change password tab (credits will be given)
+
+## Todo
+- add password strength meter on client side, so user can create complex passwords
+- check on client side for empty fields
\ No newline at end of file
diff --git a/builds/passwd-1.0.zip b/builds/passwd-1.0.zip
new file mode 100644
index 0000000..0235122
Binary files /dev/null and b/builds/passwd-1.0.zip differ
diff --git a/config.php b/config.php
index a9c340c..2ad5e02 100644
--- a/config.php
+++ b/config.php
@@ -1,6 +1,6 @@
 <?php
 /** Enable the passwd plugin for all clients **/
-define('PLUGIN_PASSWD_USER_DEFAULT_ENABLE', true);
+define('PLUGIN_PASSWD_USER_DEFAULT_ENABLE', false);
 
 /** Define zarafa installtion uses LDAP **/
 define('PLUGIN_PASSWD_LDAP', false);
diff --git a/manifest.xml b/manifest.xml
index 27513cc..eecb0ea 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
 	<info>
-		<version>0.2</version>
+		<version>1.0</version>
 		<name>Passwd</name>
-		<title>Password Changer Plugin</title>
+		<title>Password Change Plugin</title>
 		<author>Saket Patel</author>
 		<authorURL>https://github.com/silentsakky</authorURL>
 		<description>Change your password from zarafa webapp</description>
diff --git a/php/class.passwdmodule.php b/php/class.passwdmodule.php
index ab1f434..0d54905 100644
--- a/php/class.passwdmodule.php
+++ b/php/class.passwdmodule.php
@@ -126,7 +126,7 @@ class PasswdModule extends Module
 							$errorMessage = _('Password is not changed.');
 						}
 					} else {
-						$errorMessage = _('Password is weak.');
+						$errorMessage = _('Password is weak. Password should contain capital, non capital letters and numbers. Password shuold have 8 to 20 characters.');
 					}
 				} else {
 					$errorMessage = _('Current password does not match.');
@@ -178,7 +178,7 @@ class PasswdModule extends Module
 				$errorMessage = _('Password is not changed.');
 			}
 		} else {
-			$errorMessage = _('Password is weak.');
+			$errorMessage = _('Password is weak. Password should contain capital, non capital letters and numbers. Password shuold have 8 to 20 characters.');
 		}
 
 		if(!empty($errorMessage)) {
@@ -196,7 +196,7 @@ class PasswdModule extends Module
 	 * will return false.
 	 * Password should meet the following criteria:
 	 * - min. 8 chars, max. 20
-	 * - contain caps und noncaps characters
+	 * - contain caps and noncaps characters
 	 * - contain numbers
 	 * @param {String} $password password which should be checked.
 	 * @return {Boolean} true if password passes the minimum requirement else false.