Added --armor support