diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
 Fltkhs - A Haskell Binding to the FLTK GUI Library
 =============================================
 
-Fltkhs aims to be a complete Haskell binding to the [FLTK GUI library] [1].
-
-While the current recommended version of FLTK is 1.3.4, the previous version 1.3.3. is also supported since some Linux distributions haven't upgraded yet.
+Fltkhs aims to be a complete Haskell binding to the [FLTK GUI library](http://www.fltk.org/index.php). The [main documentation](https://hackage.haskell.org/package/fltkhs-0.5.1.7/docs/Graphics-UI-FLTK-LowLevel-FLTKHS.html) has more detail on motivation and what this library hopes to achieve.
 
 Quick Install
 -------------
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -97,12 +97,11 @@
           updateEnv "LIBRARY_PATH" (fltkDir </> "lib")
           updateEnv "PATH" (fltkDir </> "fluid")
           updateEnv "PATH" fltkDir
-          (getEnv "PATH") >>= putStrLn
     )
 
 myPreConf :: Args -> ConfigFlags -> IO HookedBuildInfo
 myPreConf args flags = do
-   if (flagIsSet (FlagName "bundled") flags)
+   if (bundledBuild flags)
    then putStrLn "Building bundled FLTK" >> buildFltk
    else return ()
    putStrLn "Running autoconf ..."
@@ -155,25 +154,27 @@
                            then Just (subString, drop (length needle) str)
                            else Just ([head str], tail str))
              haystack)
+
+bundledBuild flags = flagIsSet (FlagName "bundled") flags
+
 cygpath o p =
   let removeTrailingNewline = head . lines  in
   removeTrailingNewline<$>(rawSystemStdout normal "cygpath" [o,  p])
 
-windowsFriendlyPaths s =
+windowsFriendlyPaths s = 
   if (isPrefixOf "/" s)
-  then (unsafePerformIO (cygpath "-m" "/")) ++ (drop 1 s)
+  then unsafePerformIO (cygpath "-m" s)
   else s
 
 myBuildHook pkg_descr local_bld_info user_hooks bld_flags =
-  do case buildOS of
-       Windows ->
-         if (flagIsSet (FlagName "bundled") (configFlags local_bld_info))
-         then do
-           projectRoot <- getCurrentDirectory
-           let fltkDir = projectRoot </> fltkSource
-           updateEnv "PATH" (windowsFriendlyPaths fltkDir)
-         else return ()
-       _ -> return ()
+  do projectRoot <- getCurrentDirectory
+     let fltkDir = projectRoot </> fltkSource
+     let confFlags = configFlags local_bld_info
+     if (bundledBuild confFlags)
+     then case buildOS of
+          Windows -> updateEnv "PATH" (windowsFriendlyPaths fltkDir)
+          _ -> updateEnv "PATH" fltkDir
+     else return ()
      let compileC = putStrLn "==Compiling C bindings==" >> runMake
      cdirexists <- doesDirectoryExist fltkcdir
      if cdirexists
@@ -204,8 +205,8 @@
                                                    libBuildInfo =
                                                      (libBuildInfo l') {
                                                         PD.ldOptions = fmap windowsFriendlyPaths ld,
-                                                        includeDirs = fmap windowsFriendlyPaths incDirs,
-                                                        extraLibDirs = cppGccPthreadPaths ++ (extraLibDirs (libBuildInfo l')),
+                                                        includeDirs = fmap windowsFriendlyPaths (incDirs ++ (if (bundledBuild confFlags) then [fltkDir] else [])),
+                                                        extraLibDirs = cppGccPthreadPaths ++ (extraLibDirs (libBuildInfo l')) ++ (if (bundledBuild confFlags) then [windowsFriendlyPaths fltkDir] else []),
                                                         extraLibs = ["stdc++", "gcc", "pthread"]
                                                      }
                                                 })
@@ -217,7 +218,6 @@
            fixedPkgDescr <- rewritePaths pkg_descr >>= return . addFltkcDir
            buildHook autoconfUserHooks fixedPkgDescr local_bld_info user_hooks bld_flags
        Linux -> do
-
          updateEnv "LIBRARY_PATH" fltkcdir
          buildHook autoconfUserHooks pkg_descr local_bld_info user_hooks bld_flags
        _ -> do
@@ -240,7 +240,7 @@
               ["c-lib" </> "libfltkc-dyn.dylib", libPref]
      _ -> rawSystemExit (fromFlag $ copyVerbosity flags) "cp"
             ["c-lib" </> "libfltkc-dyn.so", libPref]
-    if (flagIsSet (FlagName "bundled") (configFlags lbi))
+    if (bundledBuild (configFlags lbi))
     then do
       projectRoot <- getCurrentDirectory
       let binPref = bindir installDirs
diff --git a/fltkhs.cabal b/fltkhs.cabal
--- a/fltkhs.cabal
+++ b/fltkhs.cabal
@@ -1,5 +1,5 @@
 name : fltkhs
-version : 0.5.1.7
+version : 0.5.1.8
 synopsis : FLTK bindings
 description:
     Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README.