diff --git a/lib/surveyable/acts_as_survey.rb b/lib/surveyable/acts_as_survey.rb
index 04e4fda..28eddaa 100644
--- a/lib/surveyable/acts_as_survey.rb
+++ b/lib/surveyable/acts_as_survey.rb
@@ -1,17 +1,14 @@
 module Surveyable
   module ActsAsSurvey
-    extend ActiveSupport::Concern
-    included do
-      has_many :questions, as: :survey, class_name: 'Surveyable::Question'
-
+    def self.included(base)
+      base.send :extend, ClassMethods
     end
     module ClassMethods
       def acts_as_survey(response_relationship, options = {})
+        has_many :questions, as: :survey, class_name: 'Surveyable::Question'
         #cattr_accessor :responses
         #self.responses = responses
       end
     end
   end
-end
-
-ActiveRecord::Base.extend(Surveyable::ActsAsSurvey)
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/lib/surveyable/version.rb b/lib/surveyable/version.rb
index 5b2cd39..93a4b22 100644
--- a/lib/surveyable/version.rb
+++ b/lib/surveyable/version.rb
@@ -1,3 +1,3 @@
 module Surveyable
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end
--
libgit2 0.21.0