Added --mask feature