FIX deprecated func+unravelling bugs#62

mansour-b wants to merge 1 commit intotomMoral:maintomMoral/dicodile:mainfrom

mansour-b:np-prodmansour-b/dicodile:np-prodCopy head branch name to clipboard