Upgraded version to take account of BZip2 dependency