diff --git a/.gitignore b/.gitignore
index d87d4be..80f81d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+rubigen.iml
+vendor/ruby
+.idea
diff --git a/Gemfile b/Gemfile
index e45e65f..fa75df1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
+
 gemspec
diff --git a/Rakefile b/Rakefile
index 041d2c2..7f286a4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
-require "rake/testtask"
+require 'rake/testtask'
 
 require './lib/rubigen'
 
diff --git a/app_generators/ruby_app/ruby_app_generator.rb b/app_generators/ruby_app/ruby_app_generator.rb
index 2ab2988..e618829 100644
--- a/app_generators/ruby_app/ruby_app_generator.rb
+++ b/app_generators/ruby_app/ruby_app_generator.rb
@@ -1,8 +1,8 @@
 require 'rbconfig'
 
 class RubyAppGenerator < RubiGen::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
+  DEFAULT_SHEBANG = File.join(RbConfig::CONFIG['bindir'],
+                              RbConfig::CONFIG['ruby_install_name'])
 
   default_options   :shebang => DEFAULT_SHEBANG
   
diff --git a/generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb b/generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb
index fae6836..ebc9965 100644
--- a/generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb
+++ b/generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb
@@ -1,6 +1,6 @@
 class InstallRubigenScriptsGenerator < RubiGen::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
+  DEFAULT_SHEBANG = File.join(RbConfig::CONFIG['bindir'],
+                              RbConfig::CONFIG['ruby_install_name'])
   
   default_options :shebang => DEFAULT_SHEBANG
   
diff --git a/lib/rubigen.rb b/lib/rubigen.rb
index 189ef5a..bb13760 100644
--- a/lib/rubigen.rb
+++ b/lib/rubigen.rb
@@ -1,6 +1,8 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'rubigen/version'
+
 require 'active_support/all' 
 
 require 'rubigen/base'
diff --git a/lib/rubigen/version.rb b/lib/rubigen/version.rb
index 53019f3..811eee8 100644
--- a/lib/rubigen/version.rb
+++ b/lib/rubigen/version.rb
@@ -1,3 +1,7 @@
 module Rubigen
   VERSION = "1.5.8"
+end
+
+module RubiGen
+  VERSION = Rubigen::VERSION
 end
\ No newline at end of file
diff --git a/rubigen.gemspec b/rubigen.gemspec
index b82ec15..f431dc0 100644
--- a/rubigen.gemspec
+++ b/rubigen.gemspec
@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
   gem.version       = Rubigen::VERSION
   
   gem.add_dependency 'activesupport', '>= 2.3.5', "< 3.2.0"
+  gem.add_dependency 'i18n'
+  gem.add_dependency 'mocha','>= 0.9.8'
+  gem.add_dependency 'launchy'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'i18n'
   gem.add_development_dependency 'rspec','~>1.3'
-  gem.add_development_dependency 'mocha','>= 0.9.8'
   gem.add_development_dependency 'cucumber','>= 0.6.2'
   gem.add_development_dependency 'shoulda','>= 2.10.3'
-  gem.add_development_dependency 'launchy'
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 98a93c0..d05873f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,4 +4,4 @@
 require File.dirname(__FILE__) + '/../lib/rubigen'
 require 'rubigen/helpers/generator_test_helper'
 include RubiGen
-require 'mocha'
+require 'mocha/setup'
diff --git a/test/test_version.rb b/test/test_version.rb
new file mode 100644
index 0000000..bd2be43
--- /dev/null
+++ b/test/test_version.rb
@@ -0,0 +1,30 @@
+require 'test/unit'
+require 'rubigen'
+
+class TestRubigenVersion < Test::Unit::TestCase
+
+  # Called before every test method runs. Can be used
+  # to set up fixture information.
+  def setup
+    # Do nothing
+  end
+
+  # Called after every test method runs. Can be used to tear
+  # down fixture information.
+
+  def teardown
+    # Do nothing
+  end
+
+  # Fake test
+  def test_version
+
+    # To change this template use File | Settings | File Templates.
+    begin
+      assert(RubiGen::VERSION == Rubigen::VERSION, "Expect RubiGen::VERSION to be defined" )
+    rescue
+      fail("Expect RubiGen::VERSION to be defined")
+    end
+
+  end
+end
\ No newline at end of file