diff --git a/Entry.hs b/Entry.hs
--- a/Entry.hs
+++ b/Entry.hs
@@ -12,6 +12,7 @@
 module Entry
 where
 import Data.Maybe
+import Data.List(intercalate)
 import Data.Text.Lazy(Text)
 import qualified Data.Text.Lazy as T
 
@@ -42,8 +43,10 @@
       maybeShow Nothing  = ""
 
 instance Show GraduationInfo where
-  show g = maybeShow (gradDegree g) " " ++ maybeShow (gradUniversity g) ", " 
-        ++ maybeShow (gradYear g) "\\n" ++ maybeShow (gradThesis g) "" 
+  show g = 
+    let ls  = map T.unpack $ catMaybes [gradDegree g, gradUniversity g, gradYear g] in
+    intercalate ", " ls  ++ "\\n" ++ maybeShow (gradThesis g)
     where
-      maybeShow gi s = if isJust gi then T.unpack (fromJust gi) ++ s else "" 
+      maybeShow (Just gi) = T.unpack gi 
+      maybeShow Nothing   = "" 
 
diff --git a/mathgenealogy.cabal b/mathgenealogy.cabal
--- a/mathgenealogy.cabal
+++ b/mathgenealogy.cabal
@@ -7,7 +7,7 @@
 -- The package version. See the Haskell package versioning policy
 -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
 -- standards guiding when and how versions should be incremented.
-Version:             0.0.1
+Version:             0.0.2
 
 Synopsis:            Discover your (academic) ancestors!
 
@@ -20,11 +20,16 @@
   .
   > mathgenealogy http://genealogy.math.ndsu.nodak.edu/id.php?id=18231 
   .
-  which will produce a directed acyclic graph in output.pdf. See 
+  which will produce a directed acyclic graph in output.pdf
+  (<http://dl.dropbox.com/u/22490968/genealogy_of_gauss.pdf>). See 
   .
   > mathgenealogy --help
   .
   for details. Requires GraphViz to run.
+  . 
+  /Changes in 0.0.2:/
+  .
+  * fixed bug regarding trailing commas (thanks to A. Koessler) 
 
 -- Homepage:            http://darcs.monoid.at/mathgenealogy