diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..f377e7d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'activemerchant', '>= 1.5.1'
+gem 'rake'
+
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..e8ecb47
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    active_merchant_ideal (0.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    active_utils (1.0.1)
+      activesupport (>= 2.3.11)
+      i18n
+    activemerchant (1.20.0)
+      active_utils (>= 1.0.1)
+      activesupport (>= 2.3.11)
+      braintree (>= 2.0.0)
+      builder (>= 2.0.0)
+      i18n
+      json (>= 1.5.1)
+      money (<= 3.7.1)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    braintree (2.13.1)
+      builder (>= 2.0.0)
+    builder (3.0.0)
+    i18n (0.6.0)
+    json (1.6.3)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    money (3.7.1)
+      i18n (~> 0.4)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_merchant_ideal!
+  activemerchant (>= 1.5.1)
+  mocha
+  rake
diff --git a/LICENSE b/LICENSE
index 1ee9351..2bc8c22 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010 Frank Oxener - Agile Dovadi B.V.
+Copyright (c) 2011 Frank Oxener - Agile Dovadi B.V.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.textile b/README.textile
index 591f21d..fa36266 100644
--- a/README.textile
+++ b/README.textile
@@ -41,10 +41,10 @@ As a gem:
 sudo gem install active_merchant_ideal 
 </pre>
 
-Add the following to your environment.rb:
+Add the following to your Gemfile:
 
 <pre>
-config.gem 'active_merchant_ideal'
+gem 'active_merchant_ideal'
 </pre>
 
 As a plugin:
@@ -78,7 +78,8 @@ h3. Test the gem
 You can run the tests from this gem with (inside the active_merchant_ideal directory):
 
 <pre>
-rake test
+ bundle install
+ bundle exec rake test
 </pre>
 
 h3. Run the remote tests (For ING BANK and Rabobank only)
@@ -89,7 +90,7 @@ h3. Run the remote tests (For ING BANK and Rabobank only)
 * For running the *seven prescribed remote test transactions* (ING bank and Rabobank) which are needed to activate the iDEAL account use 
 
 <pre>
-rake test:remote
+ bundle exec rake test:remote
 </pre>
 
 h3. Compatibility
diff --git a/Rakefile b/Rakefile
index 32926aa..30bba2c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,4 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "active_merchant_ideal"
-    gem.summary = %Q{iDEAL gateway for ActiveMerchant}
-    gem.description = %Q{iDEAL payment gateway for ActiveMerchant (see http://www.ideal.nl and http://www.activemerchant.org/)}
-    gem.email = "frank.oxener@gmail.com"
-    gem.homepage = "http://github.com/dovadi/active_merchant_ideal"
-    gem.authors = ["Soemirno Kartosoewito, Matthijs Kadijk, Aloy Duran, Frank Oxener"]
-    gem.add_dependency('activemerchant', '>= 1.5.1')
-    gem.add_development_dependency "mocha", ">= 0.9.7"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -30,19 +11,9 @@ namespace :test do
   desc "Run the remote tests for iDEAL gateway"
   Rake::TestTask.new(:remote) do |t|
     t.libs << "test"
-    t.test_files = FileList['remote_ideal_test.rb']
+    t.test_files = FileList['test/remote_ideal_test.rb']
     t.verbose = true
   end
 end
 
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "active_merchant_ideal #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff --git a/VERSION b/VERSION
deleted file mode 100644
index a192233..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.1.6
\ No newline at end of file
diff --git a/active_merchant_ideal.gemspec b/active_merchant_ideal.gemspec
index 5953940..bcef2b8 100644
--- a/active_merchant_ideal.gemspec
+++ b/active_merchant_ideal.gemspec
@@ -1,62 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "active_merchant_ideal/version"
 
 Gem::Specification.new do |s|
   s.name = %q{active_merchant_ideal}
-  s.version = "0.1.6"
+  s.version      = ActiveMerchantIdeal::VERSION
+  s.authors      = ["Soemirno Kartosoewito, Matthijs Kadijk, Aloy Duran, Frank Oxener and many others"]
+  s.description  = %q{iDEAL payment gateway for ActiveMerchant (see http://www.ideal.nl and http://www.activemerchant.org/)}
+  s.summary      = %q{iDEAL gateway for ActiveMerchant}
+  s.email        = %q{frank.oxener@gmail.com}
+
+  s.homepage     = %q{http://github.com/dovadi/active_merchant_ideal}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Soemirno Kartosoewito, Matthijs Kadijk, Aloy Duran, Frank Oxener"]
-  s.date = %q{2010-12-08}
-  s.description = %q{iDEAL payment gateway for ActiveMerchant (see http://www.ideal.nl and http://www.activemerchant.org/)}
-  s.email = %q{frank.oxener@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.textile"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "active_merchant_ideal.gemspec",
-    "init.rb",
-    "lib/active_merchant_ideal.rb",
-    "lib/active_merchant_ideal/acquirers.yml",
-    "lib/active_merchant_ideal/ideal.rb",
-    "lib/active_merchant_ideal/ideal_response.rb",
-    "test/fixtures.yml",
-    "test/helper.rb",
-    "test/remote_ideal_test.rb",
-    "test/test_active_merchant_ideal.rb"
-  ]
-  s.homepage = %q{http://github.com/dovadi/active_merchant_ideal}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{iDEAL gateway for ActiveMerchant}
-  s.test_files = [
-    "test/helper.rb",
-    "test/remote_ideal_test.rb",
-    "test/test_active_merchant_ideal.rb"
-  ]
+     "LICENSE",
+     "README.textile"
+   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "active_merchant_ideal"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemerchant>, [">= 1.5.1"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-    else
-      s.add_dependency(%q<activemerchant>, [">= 1.5.1"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    end
-  else
-    s.add_dependency(%q<activemerchant>, [">= 1.5.1"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-  end
-end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
+  s.add_development_dependency "mocha"
+end
diff --git a/lib/active_merchant_ideal/version.rb b/lib/active_merchant_ideal/version.rb
new file mode 100644
index 0000000..ed5b1b5
--- /dev/null
+++ b/lib/active_merchant_ideal/version.rb
@@ -0,0 +1,3 @@
+module ActiveMerchantIdeal
+  VERSION = '0.1.6'
+end
\ No newline at end of file
diff --git a/test/remote_ideal_test.rb b/test/remote_ideal_test.rb
index 8df6f46..cfeef1e 100644
--- a/test/remote_ideal_test.rb
+++ b/test/remote_ideal_test.rb
@@ -65,6 +65,7 @@ def test_retrieval_of_issuers
   end
 
   def test_successful_transaction
+    p capture_transaction(:success)
     assert_success capture_transaction(:success)
   end