diff --git a/README.md b/README.md
index bcf78fd6..a65ff338 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ want to  avoid the need to write **long commands** over and over
 again? Are you looking for a tool that is able to manage your 
 **favorite** commands?
 
-HSTR (**H**i**ST**o**R**y) is a command line utility that brings improved Bash command completion
+HSTR (**H**i**ST**o**R**y) is a command line utility that brings improved Bash/zsh command completion
 from the history. It aims to make completion **easier** and more **efficient**
 than <kbd>Ctrl</kbd><kbd>r</kbd>.
 
diff --git a/hh.pro b/hstr.pro
similarity index 100%
rename from hh.pro
rename to hstr.pro
diff --git a/src/hstr_utils.c b/src/hstr_utils.c
index 1de57d3b..dd7dc880 100644
--- a/src/hstr_utils.c
+++ b/src/hstr_utils.c
@@ -23,6 +23,11 @@
 // TODO PID_BUFFER 20+ characters might be enough
 #define PID_BUFFER_SIZE 128
 
+// This define  is used to compile out code which inserts command to console - thus
+// define allows to activate and debug shell script workaround that is used on WSL
+// and Cygwin.
+#define DEBUG_NO_TIOCSTI
+
 // strdup() not in ISO C
 char* hstr_strdup(const char* s)
 {
@@ -101,7 +106,7 @@ void hstr_chop(char *s)
     }
 }
 
-#if !defined(__MS_WSL__) && !defined(__CYGWIN__)
+#if !defined(__MS_WSL__) && !defined(__CYGWIN__) && !defined(DEBUG_NO_TIOCSTI)
 void tiocsti()
 {
     char buf[] = DEFAULT_COMMAND;
@@ -115,7 +120,7 @@ void tiocsti()
 void fill_terminal_input(char* cmd, bool padding)
 {
     if(cmd && strlen(cmd)>0) {
-#if defined(__MS_WSL__) || defined(__CYGWIN__)
+#if defined(__MS_WSL__) || defined(__CYGWIN__) || defined(DEBUG_NO_TIOCSTI)
         fprintf(stderr, "%s", cmd);
         if(padding) fprintf(stderr, "%s", "\n");
 #else
diff --git a/test/hh-unit-tests b/test/hh-unit-tests
deleted file mode 100755
index 35fe6f2f..00000000
Binary files a/test/hh-unit-tests and /dev/null differ
diff --git a/test/hh-unit-tests.pro b/test/hstr-unit-tests.pro
similarity index 100%
rename from test/hh-unit-tests.pro
rename to test/hstr-unit-tests.pro