Add support for Mahdi (Thanks to visanciprian!)