Merge branch 'adamed/instance'

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/wmi-lite/wmi.rb b/lib/wmi-lite/wmi.rb
index 57c1ab2..61fd0c3 100644
--- a/lib/wmi-lite/wmi.rb
+++ b/lib/wmi-lite/wmi.rb
@@ -17,6 +17,7 @@
 #
 
 require 'win32ole' if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+require 'wmi-lite/wmi_instance'
 
 module WmiLite
   class Wmi
diff --git a/lib/wmi-lite/wmi_instance.rb b/lib/wmi-lite/wmi_instance.rb
index 88228c7..a6f7256 100644
--- a/lib/wmi-lite/wmi_instance.rb
+++ b/lib/wmi-lite/wmi_instance.rb
@@ -23,7 +23,7 @@ module WmiLite
 
       def initialize(wmi_ole_object)
         @wmi_ole_object = wmi_ole_object
-        @property_map = self.class.wmi_ole_object_to_hash(wmi_ole_object)
+        @property_map = wmi_ole_object_to_hash(wmi_ole_object)
       end
 
       def [](key)
@@ -32,7 +32,7 @@ module WmiLite
 
       private
 
-      def self.wmi_ole_object_to_hash(wmi_object)
+      def wmi_ole_object_to_hash(wmi_object)
         property_map = {}
         wmi_object.properties_.each do |property|
           property_map[property.name.downcase] = wmi_object.invoke(property.name)