diff --git a/Gemfile b/Gemfile
index 25481dd..237c9be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'trollop'
+gem 'trollop', '~> 2.0'
+gem 'right_aws', :git => 'https://github.com/rightscale/right_aws.git'
 gem 's3'
 gem 'ruby-atmos-pure'
-gem 'right_aws'
-gem 'net_dav', :git => 'https://github.com/devrandom/net_dav.git', :require => 'net/dav'
+gem 'net_dav'
 
 #gem 'curb', :require => false
diff --git a/README.md b/README.md
index ffa4542..ea2e199 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,6 @@ that is. If you want to upload & delete the local cache of media files, run:
 
 	$ git media clear
 
-If you want to replace file in git-media with changed version (for example, video file has been edited),
-you need to explicitly tell git that some media files has changed:
-
-    $ git update-index --really-refresh
-
-
 ## Config Settings
 
 	$ git config --global media.auto-download false
@@ -95,10 +89,13 @@ you need to explicitly tell git that some media files has changed:
 
 ## Installing
 
-    $ sudo gem install bundler
-    $ bundle install
+    $ sudo gem install trollop
+    $ sudo gem install s3
+    $ sudo gem install ruby-atmos-pure
+    $ sudo gem install right_aws
+    $ sudo gem install net_dav
     $ gem build git-media.gemspec
-    $ sudo gem install git-media-*.gem
+    $ sudo gem install git-media-0.1.3.gem
 
 ## Notes for Windows
 
diff --git a/git-media.gemspec b/git-media.gemspec
index 3bc0fd0..ef3ed4b 100644
--- a/git-media.gemspec
+++ b/git-media.gemspec
@@ -45,19 +45,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/alebedev/git-media"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.28"
+  s.rubygems_version = "2.2.2"
   s.summary = "git-media"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<trollop>, [">= 0"])
-    else
-      s.add_dependency(%q<trollop>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<trollop>, [">= 0"])
-  end
+  s.add_dependency(%q<trollop>, ["~> 2"]) 
 end
 
diff --git a/lib/git-media/sync.rb b/lib/git-media/sync.rb
index 866b05f..d30e884 100644
--- a/lib/git-media/sync.rb
+++ b/lib/git-media/sync.rb
@@ -35,7 +35,7 @@ def self.expand_references
 
     def self.update_index
       refs = GitMedia::Status.find_references
-      `git update-index --assume-unchanged -- #{refs[:expanded].join(' ')}`
+      refs[:expanded].each{ |x| `git update-index --assume-unchanged -- "#{x}"`}
       puts "Updated git index"
     end
 
@@ -51,4 +51,4 @@ def self.upload_local_cache
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/git-media/transport.rb b/lib/git-media/transport.rb
index f715ad9..c467a65 100644
--- a/lib/git-media/transport.rb
+++ b/lib/git-media/transport.rb
@@ -13,7 +13,7 @@ def push(sha)
       end
 
       ## OVERWRITE ##
-      
+
       def read?
         false
       end
@@ -29,11 +29,11 @@ def get_file(sha, to_file)
       def put_file(sha, to_file)
         false
       end
-      
+
       def get_unpushed(files)
         files
       end
-      
+
     end
   end
-end
\ No newline at end of file
+end