diff --git a/Codec/BMP.hs b/Codec/BMP.hs
--- a/Codec/BMP.hs
+++ b/Codec/BMP.hs
@@ -112,11 +112,11 @@
  = let  -- Next comes the image header. 
         -- The first word tells us how long it is.
         sizeHeader      = runGet getWord32le buf
-        
-        -- split off the image header
-        (bufImageHeader, bufRest)
-                = BSL.splitAt (fromIntegral sizeHeader) buf
-        
+
+        -- Split off the image header
+        bufImageHeader  = BSL.take (fromIntegral sizeHeader) buf
+        bufRest         = BSL.drop (fromIntegral (fromIntegral (fileHeaderOffset fileHeader) - sizeOfFileHeader)) buf
+
         -- How much non-header data is present in the file.
         -- For uncompressed data without a colour table, the remaining data
         -- should be the image, but there may also be padding bytes on the
diff --git a/bmp.cabal b/bmp.cabal
--- a/bmp.cabal
+++ b/bmp.cabal
@@ -1,17 +1,17 @@
 Name:                bmp
-Version:             1.2.6.3
+Version:             1.2.6.4
 License:             MIT
 License-file:        LICENSE
 Author:              Ben Lippmeier
 Maintainer:          benl@ouroborus.net
 Build-Type:          Simple
-Cabal-Version:       >=1.6
+Cabal-Version:       >=1.10
 Stability:           stable
 Category:            Codec
 Homepage:            https://github.com/benl23x5/bmp
 Bug-reports:         bmp@ouroborus.net
 Description:
-	Read and write uncompressed BMP image files. 100% robust Haskell implementation.
+        Read and write uncompressed BMP image files. 100% robust Haskell implementation.
 Synopsis:
         Read and write uncompressed BMP image files.
 
@@ -22,13 +22,16 @@
 Library
   build-Depends: 
         base                 == 4.*,
-        bytestring           == 0.10.*,
+        bytestring           >= 0.10 && < 0.13,
         binary               >= 0.6 && < 0.9
 
   ghc-options:
         -O2 -Wall -fno-warn-missing-signatures
 
-  extensions:
+  default-language:
+        Haskell98
+
+  default-extensions:
         BangPatterns
         ScopedTypeVariables
         PatternGuards