diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..851fabc
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec
diff --git a/Manifest.txt b/Manifest.txt
index 527caf4..8bf9d69 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,3 +1,4 @@
+Gemfile
 History.txt
 LICENSE.txt
 Manifest.txt
diff --git a/Rakefile b/Rakefile
index 8901a46..ab9baa6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,6 @@ require 'rubygems'
 require 'hoe'
 require './lib/namecase.rb'
 
-Hoe.new('namecase', NameCase::VERSION) do |p|
+Hoe.spec('namecase') do |p|
   p.developer('Aaron Patterson', 'aaronp@rubyforge.org')
 end
diff --git a/lib/namecase.rb b/lib/namecase.rb
index 85182fa..1005dc7 100644
--- a/lib/namecase.rb
+++ b/lib/namecase.rb
@@ -3,7 +3,7 @@ module NameCase
 
   # Returns a new +String+ with the contents properly namecased
   def nc(options = {})
-    options = { :lazy => true, :irish => false }.merge options
+    options = { :lazy => true, :irish => true }.merge options
 
     # Skip if string is mixed case
     if options[:lazy]
diff --git a/namecase.gemspec b/namecase.gemspec
index 217beea..719ff8e 100644
--- a/namecase.gemspec
+++ b/namecase.gemspec
@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   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 "hoe"
 end
diff --git a/test/test_namecase.rb b/test/test_namecase.rb
index 5ffc736..4c9a849 100644
--- a/test/test_namecase.rb
+++ b/test/test_namecase.rb
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 $:.unshift File.join(File.dirname(__FILE__), "..", "test")
 
@@ -31,17 +33,18 @@ def setup
 
   def test_namecase
     @proper_names.each do |name|
-      nc_name = NameCase.new(name)
-      assert_equal(name, nc_name.downcase.nc)
-      assert_equal(name, NameCase.nc(name))
+      assert_equal(name, NameCase(name.downcase))
+      n = name.dup
+      n.extend(NameCase)
+      assert_equal(name, n.nc)
       assert_equal(name, NameCase(name))
     end
   end
 
   def test_namecase_modify
     @proper_names.each do |name|
-      nc_name = NameCase.new(name)
-      assert_equal(name, nc_name.downcase.nc!)
+      nc_name = NameCase!(name.downcase)
+      assert_equal(name, nc_name)
     end
   end
 
@@ -49,7 +52,7 @@ def test_namecase_multibyte
     $KCODE = 'u'
 
     proper_cased = 'Iñtërnâtiônàlizætiøn'
-    nc_name = NameCase.new(proper_cased)
-    assert_equal(proper_cased, nc_name.downcase.nc)
+    nc_name = NameCase(proper_cased.downcase)
+    assert_equal(proper_cased, nc_name)
   end
 end