diff --git a/newrepo b/newrepo
index 51455be..54af871 100755
--- a/newrepo
+++ b/newrepo
@@ -1,4 +1,15 @@
-#!/bin/sh
-mkdir -p ~/$1
-cd ~/$1
-git init --bare
+#!/bin/bash
+
+repo_name="$1"
+
+if [[ $repo_name =~ ^.*/$ ]] ; then
+    echo "Failed to create new repository."
+    echo "Don't place a slash after repository's name"
+    exit 1
+fi
+
+if [[ ! $repo_name =~ ^.*\.git$ ]] ; then
+    repo_name="${repo_name}.git"
+fi
+
+git init --bare ${repo_name}