Added --nosubspec option