Added option to enable/disable mashify