diff --git a/.gitignore b/.gitignore
index b10af54..820edb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,11 @@ bin
 .classpath
 .settings
 
+# intellij
+.idea
+*.iml
+local.properties
+
 # log
 *.log*
 
diff --git a/src/main/groovy/org/batcha/gradle/plugins/git/InitGitDependenciesTask.groovy b/src/main/groovy/org/batcha/gradle/plugins/git/InitGitDependenciesTask.groovy
index 44301a5..809d865 100644
--- a/src/main/groovy/org/batcha/gradle/plugins/git/InitGitDependenciesTask.groovy
+++ b/src/main/groovy/org/batcha/gradle/plugins/git/InitGitDependenciesTask.groovy
@@ -57,8 +57,6 @@ class InitGitDependenciesTask extends DefaultTask {
     }
   }
 
-
-
   def init(Project project, Multimap<ExternalModuleDependency, Configuration> gitDependencies) {
 
     //resolve the dependencies found
@@ -70,5 +68,4 @@ class InitGitDependenciesTask extends DefaultTask {
 
     }
   }
-
 }
diff --git a/src/main/groovy/org/batcha/gradle/plugins/git/RefreshGitDependenciesTask.groovy b/src/main/groovy/org/batcha/gradle/plugins/git/RefreshGitDependenciesTask.groovy
index 3b423c2..0dc9ca8 100644
--- a/src/main/groovy/org/batcha/gradle/plugins/git/RefreshGitDependenciesTask.groovy
+++ b/src/main/groovy/org/batcha/gradle/plugins/git/RefreshGitDependenciesTask.groovy
@@ -55,7 +55,4 @@ class RefreshGitDependenciesTask extends DefaultTask {
 
     }
   }
-
-
-
 }
diff --git a/src/main/groovy/org/batcha/gradle/plugins/git/ResolveGitDependenciesTask.groovy b/src/main/groovy/org/batcha/gradle/plugins/git/ResolveGitDependenciesTask.groovy
index 12f63b3..7f05943 100644
--- a/src/main/groovy/org/batcha/gradle/plugins/git/ResolveGitDependenciesTask.groovy
+++ b/src/main/groovy/org/batcha/gradle/plugins/git/ResolveGitDependenciesTask.groovy
@@ -43,7 +43,7 @@ class ResolveGitDependenciesTask extends DefaultTask {
   }
 
   /**
-   * Iterates trough dependencies specification and resolve the Git-Dependencies.
+   * Iterates through dependencies specification and resolve the Git-Dependencies.
    */
   @TaskAction
   def resolveDependencies() {
diff --git a/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GitHelper.groovy b/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GitHelper.groovy
index 96faa35..4bd5fdd 100644
--- a/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GitHelper.groovy
+++ b/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GitHelper.groovy
@@ -75,12 +75,18 @@ class GitHelper {
       }
       cmd.setName(version)
     } else {
-      cmd.setCreateBranch(true)
       RevWalk revWalk = new RevWalk(repo.getRepository())
       ObjectId id = repo.getRepository().resolve(version)
       if (id == null) {
+        if(!branchesLocal.contains("master")) {
+          cmd.setCreateBranch(true)
+        }
         cmd.setName("master")
       } else {
+        if(!branchesLocal.contains(version)) {
+          cmd.setCreateBranch(true)
+        }
+
         RevCommit commit = revWalk.parseCommit(id)
         cmd.setStartPoint(commit)
         cmd.setName(version)
diff --git a/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GradleDependenciesHelper.groovy b/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GradleDependenciesHelper.groovy
index 0a0fb4c..30bc731 100644
--- a/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GradleDependenciesHelper.groovy
+++ b/src/main/groovy/org/batcha/gradle/plugins/git/dependencies/GradleDependenciesHelper.groovy
@@ -156,5 +156,4 @@ class GradleDependenciesHelper {
     GitHelper.checkoutVersion(destinationDir, gitVersion)
 
   }
-
 }