Added Daniel Borchmann's patch to honor version number from tags