diff --git a/lib/rolify.rb b/lib/rolify.rb
index 5c02eb5e..b009b597 100644
--- a/lib/rolify.rb
+++ b/lib/rolify.rb
@@ -19,7 +19,14 @@ def rolify(options = {})
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
-    default_join_table = "#{self.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
+    if options[:table_name].nil?
+      table_name = self.to_s
+    else
+      table_name = options[:table_name]
+    end  
+
+    
+    default_join_table = "#{table_name.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
     options.reverse_merge!({:role_join_table_name => default_join_table})
     self.role_join_table_name = options[:role_join_table_name]