2 files changed, 6 insertions, 7 deletions
diff --git a/lib/evernote/client.rb b/lib/evernote/client.rb
index e6962dc..1522d59 100644
--- a/lib/evernote/client.rb
+++ b/lib/evernote/client.rb
@@ -1,7 +1,6 @@
-require 'forwardable'
-
 module Evernote
   class Client
+    attr_reader :client
 
     THRIFT_DEFAULTS = {
       :transport => Thrift::HTTPClientTransport
@@ -11,9 +10,5 @@ module Evernote
       thrift_opts = THRIFT_DEFAULTS.merge(thrift_client_options)
       @client = ThriftClient.new(klass, url, thrift_opts)
     end
-
-    def method_missing(name, *args, &block)
-      @client.send(name, *args, &block)
-    end
   end
 end
diff --git a/lib/evernote/user_store.rb b/lib/evernote/user_store.rb
index 2b60756..b9ccc17 100644
--- a/lib/evernote/user_store.rb
+++ b/lib/evernote/user_store.rb
@@ -25,7 +25,11 @@ module Evernote
     end
 
     def version_valid?
-      @client.checkVersion("Ruby EDAMTest", Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+      checkVersion("Ruby EDAMTest", Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+    end
+
+    def method_missing(name, *args, &block)
+      @client.client.send(name, *args, &block)
     end
   end
 end