2 files changed, 9 insertions, 3 deletions

diff --git a/TODO.org b/TODO.org
index ddd2a846..7a8ac308 100644
--- a/TODO.org
+++ b/TODO.org
@@ -9,7 +9,7 @@
 * DONE add readme
 * DONE return scheme back
 * DONE add Show instance for Method
-* TODO add BEncodable instance for Method
-* TODO hide async api
+* DONE add BEncodable instance for Method
+* TODO remove async api
 * TODO expose client addr in server-side
 * TODO major version bump (reason: exported type changed)
diff --git a/src/Remote/KRPC.hs b/src/Remote/KRPC.hs
index 71faa3f3..88882da2 100644
--- a/src/Remote/KRPC.hs
+++ b/src/Remote/KRPC.hs
@@ -91,6 +91,7 @@
 {-# LANGUAGE ExplicitForAll      #-}
 {-# LANGUAGE KindSignatures      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE DeriveGeneric       #-}
 module Remote.KRPC
        ( -- * Method
          Method(..)
@@ -121,8 +122,11 @@ import Data.Monoid
 import Data.Typeable
 import Network
 
+import GHC.Generics
+
 import Remote.KRPC.Protocol
 
+
 -- | Method datatype used to describe name, parameters and return
 --   values of procedure. Client use a method to /invoke/, server
 --   /implements/ the method to make the actual work.
@@ -154,7 +158,9 @@ data Method param result = Method {
 
     -- | Name of each return value in /right to left/ order.
   , methodVals   :: [ValName]
-  }
+  } deriving (Eq, Ord, Generic)
+
+instance BEncodable (Method a b)
 
 instance (Typeable a, Typeable b) => Show (Method a b) where
   showsPrec _ = showsMethod