diff --git a/Version.hs b/Version.hs
new file mode 100644
--- /dev/null
+++ b/Version.hs
@@ -0,0 +1,8 @@
+-- | Expose cabal package version as a string
+module Version (versionString) where
+
+import Paths_git_mediate (version)
+import Data.Version (showVersion)
+
+versionString :: String
+versionString = showVersion version
diff --git a/git-mediate.cabal b/git-mediate.cabal
--- a/git-mediate.cabal
+++ b/git-mediate.cabal
@@ -2,10 +2,10 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                git-mediate
-version:             1.0
+version:             1.0.1
 synopsis:            Remove trivial conflict markers in a git repository
 description:         Remove trivial conflict markers in a git repository
-homepage:            https://github.com/ElastiLotem/git-mediate
+homepage:            https://github.com/Peaker/git-mediate
 license:             GPL-2
 license-file:        LICENSE
 author:              Eyal Lotem
@@ -18,11 +18,11 @@
 
 source-repository head
   type: git
-  location: https://github.com/Elastilotem/git-mediate
+  location: https://github.com/Peaker/git-mediate
 
 executable git-mediate
   main-is:             git-mediate.hs
-  other-modules:       PPDiff, Opts
+  other-modules:       PPDiff, Opts, Version
   -- other-extensions:
   build-depends:       base >=4.6 && <5
                      , base-compat >= 0.8.2 && < 0.10
diff --git a/git-mediate.hs b/git-mediate.hs
--- a/git-mediate.hs
+++ b/git-mediate.hs
@@ -88,7 +88,7 @@
         takeEnd count xs = drop (length xs - count) xs
         unmatched xs = drop matchTop $ dropEnd matchBottom xs
 
--- '>' -> ">>>>>>> "
+-- '>' -> ">>>>>>>"
 markerPrefix :: Char -> String
 markerPrefix = replicate 7