diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 513076a..6e7b7c4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ Please report unacceptable behavior to any project maintainer.
 
 * **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/pivpn/pivpn/issues).
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/pivpn/pivpn/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/pivpn/pivpn/issues/new/choose). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
 #### **Do you want to open a pull request to modify the source?**
 
@@ -28,6 +28,6 @@ Please report unacceptable behavior to any project maintainer.
 
 </br>
 
-Thanks! 
+Thanks!
 
 PiVPN Team
diff --git a/README.md b/README.md
index 5f8eb9d..4742a5a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 ![WireGuard + OpenVPN logo](logos.jpg)
 
 **[Is pivpn.io down?](https://status.pivpn.io)** |
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/452112df3c2c435d93aacc113f546eae)](https://app.codacy.com/gh/pivpn/pivpn?utm_source=github.com&utm_medium=referral&utm_content=pivpn/pivpn&utm_campaign=Badge_Grade_Settings)
 **Test:** [![Build Status](https://travis-ci.com/pivpn/pivpn.svg?branch=test)](https://travis-ci.com/pivpn/pivpn) |
 **Master:** [![Build Status](https://travis-ci.com/pivpn/pivpn.svg?branch=master)](https://travis-ci.com/pivpn/pivpn)
 
@@ -100,7 +101,7 @@ After the installation is complete you can use the command `pivpn` to manage the
 Feedback & Support
 --------
 
-#### Please read carefully the [issue template](https://github.com/pivpn/pivpn/blob/master/ISSUE_TEMPLATE.md) and the [contributors' guide](https://github.com/pivpn/pivpn/blob/master/CONTRIBUTING.md), we will close all incomplete issue templates.
+#### Before submitting any new issue or Pull request, please carefully read the [contributors' guide](https://github.com/pivpn/pivpn/blob/master/CONTRIBUTING.md) also please properly select the correct type of issue and and fill the presented template with all requested data! we will close all incomplete issue templates.
 
 PiVPN is purely community driven, and we are interested in making this script work for as many people as possible, we welcome any feedback on your experience.
 Please be respectful and be aware that this is maintained with our free time!