diff --git a/aws-sdk-xml-unordered.cabal b/aws-sdk-xml-unordered.cabal
--- a/aws-sdk-xml-unordered.cabal
+++ b/aws-sdk-xml-unordered.cabal
@@ -1,32 +1,28 @@
--- Initial xml-conduit-unordered.cabal generated by cabal init.  For
--- further documentation, see http://haskell.org/cabal/users-guide/
-
 name:                aws-sdk-xml-unordered
-version:             0.1.0.0
-synopsis:            XML parser for aws-sdk
-description:         This package provides a unordered xml parser for aws-sdk.
+version:             0.1.0.1
+synopsis:            The xml parser for aws-sdk
+description:         This package provides the unordered xml parser for aws-sdk.
 license:             BSD3
 license-file:        LICENSE
-author:              Shohei Yasutake
-maintainer:          amutake.s@gmail.com
+author:              Shohei Yasutake <amutake.s@gmail.com>
+maintainer:          Shohei Yasutake <amutake.s@gmail.com>
+homepage:            https://github.com/worksap-ate/aws-sdk-xml-unordered
+bug-reports:         https://github.com/worksap-ate/aws-sdk-xml-unordered/issue
 -- copyright:
 category:            XML
 build-type:          Simple
--- extra-source-files:
 cabal-version:       >=1.10
 
 library
   exposed-modules:     Cloud.AWS.Lib.Parser.Unordered
-  -- other-modules:
-  -- other-extensions:
-  build-depends:       base >=4.6 && <4.7
-                     , unordered-containers
-                     , conduit
-                     , xml-conduit
-                     , xml-types
-                     , text
-                     , mtl
-                     , aws-sdk-text-converter
+  build-depends:       base ==4.*
+                     , unordered-containers >=0.2
+                     , conduit >=1.0.1
+                     , xml-conduit >=0.5
+                     , xml-types ==0.3.*
+                     , text >=0.1
+                     , mtl >=1.0
+                     , aws-sdk-text-converter >=0.1
   hs-source-dirs:      src
   ghc-options:         -Wall -fno-warn-unused-do-bind
   default-language:    Haskell2010
@@ -35,17 +31,15 @@
   type:                exitcode-stdio-1.0
   main-is:             test.hs
   hs-source-dirs:      test
-  build-depends:       base
+  build-depends:       base ==4.*
                      , bytestring
                      , text
-                     , mtl
                      , conduit
                      , xml-conduit
-                     , xml-types
-                     , aws-sdk-text-converter
                      , aws-sdk-xml-unordered
                      , hspec
   ghc-options:       -Wall -threaded -fno-warn-unused-do-bind
+  default-language:  Haskell2010
 
 source-repository head
   type:                git
diff --git a/src/Cloud/AWS/Lib/Parser/Unordered.hs b/src/Cloud/AWS/Lib/Parser/Unordered.hs
--- a/src/Cloud/AWS/Lib/Parser/Unordered.hs
+++ b/src/Cloud/AWS/Lib/Parser/Unordered.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable, OverloadedStrings #-}
 
 module Cloud.AWS.Lib.Parser.Unordered
-    ( SimpleXML (..)
+    ( SimpleXML
     , ParseError (..)
     , xmlParser
     , xmlParserM
@@ -12,24 +12,23 @@
     , getElements
     ) where
 
-import Control.Applicative
+import Cloud.AWS.Lib.FromText (FromText (..))
+import Control.Applicative ((<$>))
 import Control.Exception (Exception)
-import Control.Monad
-import Control.Monad.Trans
-import Data.Char
-import Data.Conduit
+import Control.Monad (liftM)
+import Control.Monad.Trans (lift)
+import Data.Char (isSpace)
+import Data.Conduit (ConduitM, Conduit, yield, MonadThrow (..))
 import qualified Data.Conduit.List as CL
-import Data.Maybe
-import Data.Monoid
-import qualified Data.Text as T
-import Data.Typeable (Typeable)
-import Data.XML.Types
-import Text.XML.Stream.Parse
-
 import Data.HashMap.Lazy (HashMap)
 import qualified Data.HashMap.Lazy as HM
-
-import Cloud.AWS.Lib.FromText
+import Data.Maybe (listToMaybe)
+import Data.Monoid ((<>))
+import Data.Text (Text)
+import qualified Data.Text as T
+import Data.Typeable (Typeable)
+import Data.XML.Types (Event (..), Name (..), Content (..))
+import Text.XML.Stream.Parse (XmlException (..))
 
 data SimpleXML = Map (HashMap Text [SimpleXML])
                | Content Text
diff --git a/test/test.hs b/test/test.hs
--- a/test/test.hs
+++ b/test/test.hs
@@ -1,12 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-import Control.Applicative
+import Control.Applicative ((<$>), (<*>), Applicative)
 import qualified Data.ByteString.Lazy as L
-import Data.Conduit
+import Data.Conduit (($$), ($=), MonadThrow (..), runResourceT)
 import qualified Data.Conduit.List as CL
 import Data.Text (Text)
 import Test.Hspec
-import Text.XML.Stream.Parse
+import Text.XML.Stream.Parse (parseLBS, def)
 
 import Cloud.AWS.Lib.Parser.Unordered