Merge pull request #604 from tdb/fix_version_check