diff --git a/README.md b/README.md
index 6096c86..95fe6b0 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ Using Go Password Manager is easy. First, use `go get` to install the latest ver
 For Linux,
 
 ```sh
-wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.1/gpassmanager-linux-amd64-v1.0.1.tar.gz
-tar xvf gpassmanager-linux-amd64-v1.0.1.tar.gz
+wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.2/gpassmanager-linux-amd64-v1.0.2.tar.gz
+tar xvf gpassmanager-linux-amd64-v1.0.2.tar.gz
 chmod +x gpassmanager
 sudo mv gpassmanager /usr/bin
 ```
@@ -55,13 +55,13 @@ You need to have `tar wget`. To install simply type `pkg install tar wget`
 
 ```sh
 cd ~
-wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.1/gpassmanager-linux-arm-v1.0.1.tar.gz
-tar xvf gpassmanager-linux-arm-v1.0.1.tar.gz
+wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.2/gpassmanager-linux-arm-v1.0.2.tar.gz
+tar xvf gpassmanager-linux-arm-v1.0.2.tar.gz
 chmod +x gpassmanager
 mv gpassmanager ../usr/bin
 ```
 
-[Note: if new version available you need to download and install by the same process. The above instructions will install v1.0.1 .]
+[Note: if new version available you need to download and install by the same process. The above instructions will install v1.0.2 .]
 
 ## Usage
 
diff --git a/cmd/add.go b/cmd/add.go
index 9349200..4189fdc 100644
--- a/cmd/add.go
+++ b/cmd/add.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/change.go b/cmd/change.go
index 158c5cd..6ea73b5 100644
--- a/cmd/change.go
+++ b/cmd/change.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/export.go b/cmd/export.go
index bf9dc55..99e6139 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/generate.go b/cmd/generate.go
index a535a05..b3bea75 100644
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/import.go b/cmd/import.go
index 32f5f78..fad147e 100644
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/license.go b/cmd/license.go
index e3b3c52..78bdc8e 100644
--- a/cmd/license.go
+++ b/cmd/license.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/remove.go b/cmd/remove.go
index a430c1e..c277019 100644
--- a/cmd/remove.go
+++ b/cmd/remove.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/reset.go b/cmd/reset.go
index c9ed327..528863b 100644
--- a/cmd/reset.go
+++ b/cmd/reset.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/search.go b/cmd/search.go
index 5731965..d7f4eef 100644
--- a/cmd/search.go
+++ b/cmd/search.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
@@ -88,7 +87,7 @@ func searchRun(cmd *cobra.Command, args []string) {
 	// prints found results
 	printableData := "\n"
 	for id, account := range accounts {
-		if strings.Contains(account.AccountName, args[0]) || strings.Contains(account.Notes, args[0]) {
+		if strings.Contains(account.AccountName, args[0]) || strings.Contains(account.UserName, args[0]) || strings.Contains(account.Notes, args[0]) {
 			founds++
 			isFound = true
 			printableData += "[" + strconv.Itoa(id+1) + "]" + "\t" + "Account: " + account.AccountName + "\n"
diff --git a/cmd/version.go b/cmd/version.go
index db9f6f4..816986b 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/cmd/view.go b/cmd/view.go
index a93be1d..cb30906 100644
--- a/cmd/view.go
+++ b/cmd/view.go
@@ -1,4 +1,3 @@
-// Package cmd ...
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/docs/_includes/03-body.md b/docs/_includes/03-body.md
index 7badabd..2983dcd 100644
--- a/docs/_includes/03-body.md
+++ b/docs/_includes/03-body.md
@@ -13,8 +13,8 @@ Using Go Password Manager is easy. First, use `go get` to install the latest ver
 For Linux,
 
 ```sh
-wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.1/gpassmanager-linux-amd64-v1.0.1.tar.gz
-tar xvf gpassmanager-linux-amd64-v1.0.1.tar.gz
+wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.2/gpassmanager-linux-amd64-v1.0.2.tar.gz
+tar xvf gpassmanager-linux-amd64-v1.0.2.tar.gz
 chmod +x gpassmanager
 sudo mv gpassmanager /usr/bin
 ```
@@ -27,13 +27,13 @@ You need to have `tar wget`. To install simply type `pkg install tar wget`
 
 ```sh
 cd ~
-wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.1/gpassmanager-linux-arm-v1.0.1.tar.gz
-tar xvf gpassmanager-linux-arm-v1.0.1.tar.gz
+wget https://github.com/mrinjamul/gpassmanager/releases/download/v1.0.2/gpassmanager-linux-arm-v1.0.2.tar.gz
+tar xvf gpassmanager-linux-arm-v1.0.2.tar.gz
 chmod +x gpassmanager
 mv gpassmanager ../usr/bin
 ```
 
-[Note: if new version available you need to download and install by the same process. The above instructions will install v1.0.1 .]
+[Note: if new version available you need to download and install by the same process. The above instructions will install v1.0.2 .]
 
 ## Get Started
 
diff --git a/gpm/gpm.go b/gpm/gpm.go
index fe9073f..c437159 100644
--- a/gpm/gpm.go
+++ b/gpm/gpm.go
@@ -70,7 +70,7 @@ func GetHomeDir() string {
 
 // GetVersion returns version name, and code
 func GetVersion() string {
-	var version = "1.0.1"
+	var version = "1.0.2"
 	return version
 }
 
diff --git a/main.go b/main.go
index 57c5cdb..354e533 100644
--- a/main.go
+++ b/main.go
@@ -1,3 +1,7 @@
+/*Package main ...
+ * A Simple CLI password Manager
+ */
+
 /*
 Copyright © 2020 Injamul Mohammad Mollah
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 75b64e3..d141fb8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,13 +1,13 @@
 name: gpassmanager
 base: core18 # the base snap is the execution environment for this snap
-version: "1.0.1" # just for humans, typically '1.2+git' or '1.3.2'
-summary: CommandLine Password Manager # 79 char long summary
+version: "1.0.2"
+summary: CommandLine Password Manager
 description: |
   A Commandline application for managing your passwords securely.
     It's a very secure password manager.
 
-grade: stable # must be 'stable' to release into candidate/stable channels
-confinement: strict # use 'strict' once you have the right plugs and slots
+grade: stable
+confinement: strict
 
 apps:
   gpassmanager: