mahdi.mk: some changes