diff --git a/lib/homesick.rb b/lib/homesick.rb
index 3416d14..479c864 100644
--- a/lib/homesick.rb
+++ b/lib/homesick.rb
@@ -32,7 +32,7 @@ class Homesick < Thor
       elsif uri =~ GITHUB_NAME_REPO_PATTERN
         destination = Pathname.new($1)
         git_clone "git://github.com/#{$1}.git", :destination => destination
-      elsif uri =~ /\/([^\/]*)(\.git)?\Z/
+      elsif uri =~ /\/([^\/]*?)(\.git)?\Z/
         destination = Pathname.new($1)
         git_clone uri
       elsif uri =~ /[^:]+:([^:]+)(\.git)?\Z/
@@ -114,7 +114,7 @@ class Homesick < Thor
     castle = Pathname.new(castle)
     file = Pathname.new(file)
     check_castle_existance(castle, 'track')
-    
+
     absolute_path = file.expand_path
     castle_path = castle_dir(castle)
     mv absolute_path, castle_path