diff --git a/doc/Manual.txt b/doc/Manual.txt
index b0857e6c32..f47482fdf2 100644
--- a/doc/Manual.txt
+++ b/doc/Manual.txt
@@ -85,7 +85,7 @@ it gives quick access to documentation for all LAMMPS commands.
 
 .. toctree::
    :maxdepth: 2
-   :numbered:
+   :numbered: // comment
    
    Section_intro
    Section_start
@@ -105,8 +105,8 @@ it gives quick access to documentation for all LAMMPS commands.
 Indices and tables
 ==================
 
-* :ref:`genindex`
-* :ref:`search`
+* :ref:`genindex` // comment
+* :ref:`search` // comment
    
 END_RST -->
 
diff --git a/lib/h5md/Makefile.lammps.empty b/lib/h5md/Makefile.lammps.empty
index e4c1c0ed66..6e64a556ff 100644
--- a/lib/h5md/Makefile.lammps.empty
+++ b/lib/h5md/Makefile.lammps.empty
@@ -2,6 +2,6 @@
 # The default settings assume that HDF5 support is integrated into the standard
 # distribution and search paths and thus only needs to link the HDF5 library.
 
-ch5md_SYSINC =
-ch5md_SYSLIB = -lhdf5
-ch5md_SYSPATH =
+h5md_SYSINC =
+h5md_SYSLIB = -lhdf5
+h5md_SYSPATH =
diff --git a/python/lammps.py b/python/lammps.py
index a3a979cd3f..deea917187 100644
--- a/python/lammps.py
+++ b/python/lammps.py
@@ -29,11 +29,11 @@ class lammps:
 
     try:
       if not name: self.lib = CDLL(join(modpath,"liblammps.so"),RTLD_GLOBAL)
-      else: self.lib = CDLL(join(modpath,"/liblammps_%s.so" % name),RTLD_GLOBAL)
+      else: self.lib = CDLL(join(modpath,"liblammps_%s.so" % name),RTLD_GLOBAL)
     except:
       type,value,tb = sys.exc_info()
       traceback.print_exception(type,value,tb)
-      raise OSError,"Could not load LAMMPS dynamic library"
+      raise OSError,"Could not load LAMMPS dynamic library from %s" % modpath
 
     # if no ptr provided, create an instance of LAMMPS
     #   don't know how to pass an MPI communicator from PyPar
@@ -70,6 +70,9 @@ class lammps:
     if self.opened: self.lib.lammps_close(self.lmp)
     self.lmp = None
 
+  def version(self):
+    return self.lib.lammps_version(self.lmp)
+
   def file(self,file):
     self.lib.lammps_file(self.lmp,file)