Initial version - added diskcheck