Tidied up version reporting, fixes #21